X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fnet%2Fhttp.c;h=891c462bbd13356c0920d0803e38c070e43c9785;hb=a03edef2a1dba1c14bd1c761bfa635250893933a;hp=235401cda382f949aa438471bbba0aaab87b2d51;hpb=567b81d9dd3bd0a0cd8df4a3d464b3273576fe73;p=bertos.git diff --git a/bertos/net/http.c b/bertos/net/http.c index 235401cd..891c462b 100644 --- a/bertos/net/http.c +++ b/bertos/net/http.c @@ -38,6 +38,8 @@ * the cases where SD is not present or page not found, using embedded pages. * Quering from browser the /status page, the server return a json dictionary where are store * some board status info, like board temperature, up-time, etc. + * + * notest: avr */ #include "http.h" @@ -52,68 +54,172 @@ #define LOG_VERBOSITY HTTP_LOG_FORMAT #include -#include - -#include - #include +#include #include static const char http_html_hdr_200[] = "HTTP/1.1 200 OK\r\nContent-type: text/html\r\n\r\n"; static const char http_html_hdr_404[] = "HTTP/1.1 404 Not Found\r\nContent-type: text/html\r\n\r\n"; +static const char http_html_hdr_500[] = "HTTP/1.1 500 Internal Server Error\r\nContent-type: text/html\r\n\r\n"; + +static HttpCGI *cgi_table; +static http_handler_t http_callback; + + +static char http_hexToAscii(char first, char second) +{ + char hex[5], *stop; + hex[0] = '0'; + hex[1] = 'x'; + hex[2] = first; + hex[3] = second; + hex[4] = 0; + return strtol(hex, &stop, 16); +} + +void http_decodeUri(const char *raw_buf, size_t raw_len, char *decodec_buf, size_t len) +{ + char value; + for (size_t i = 0; i < raw_len; i++) + { + if (raw_buf[i] == '%') + { + if (i + 2 < raw_len) + { + /* convert hex value after % */ + value = http_hexToAscii(raw_buf[i + 1], raw_buf[i + 2]); + if (value) + { + *decodec_buf++ = value; + i += 2; + continue; + } + } + } + *decodec_buf++ = raw_buf[i]; + } +} + +void http_getPageName(const char *recv_buf, size_t recv_len, char *page_name, size_t len) +{ + int i = 0; + bool str_ok = false; + + if (recv_buf && (recv_len > sizeof("GET /"))) + { + if (*recv_buf++ == 'G' && + *recv_buf++ == 'E' && *recv_buf++ == 'T') + { + str_ok = true; + /* skip the space and "/" */ + recv_buf += 2; + } + } + + if (str_ok) + { + while ((size_t)i < recv_len) + { + char ch = *(recv_buf++); + if (ch == ' ' || ch == '\t' || ch == '\n') + break; + if((size_t)i == len - 1) + break; + page_name[i++] = ch; + } + } + + page_name[i] = '\0'; +} + +INLINE const char *get_ext(const char *name) +{ + const char *ext = strstr(name, "."); + if(ext && (ext + 1)) + return (ext + 1); + + return NULL; +} + +/** + * Send on \param client socket + * the 200 Ok http header + */ void http_sendOk(struct netconn *client) { netconn_write(client, http_html_hdr_200, sizeof(http_html_hdr_200) - 1, NETCONN_NOCOPY); } + +/** + * Send on \param client socket + * the 404 File not found http header + */ void http_sendFileNotFound(struct netconn *client) { netconn_write(client, http_html_hdr_404, sizeof(http_html_hdr_404) - 1, NETCONN_NOCOPY); } +/** + * Send on \param client socket + * the 500 internal server error http header + */ +void http_sendInternalErr(struct netconn *client) +{ + netconn_write(client, http_html_hdr_500, sizeof(http_html_hdr_500) - 1, NETCONN_NOCOPY); +} -static void get_fileName(char *revc_buf, char *name, size_t len) +static http_handler_t cgi_search(const char *name, HttpCGI *table) { - char *p = strstr(revc_buf, "GET"); - if (p) + if (!table) + return NULL; + + int i = 0; + const char *ext = get_ext(name); + LOG_INFO("EXT %s\n", ext); + while(table[i].name) { - //skip the "/" in get string request - p += sizeof("GET") + 1; - for (size_t i = 0; *p != ' '; i++,p++) + if (ext && table[i].type == CGI_MATCH_EXT) { - if (i > len) + LOG_INFO("Match all ext %s\n", ext); + if (!strcmp(table[i].name, ext)) + break; + } + else if (table[i].type == CGI_MATCH_NAME) + { + LOG_INFO("Match all name %s\n", name); + if (strstr(name, table[i].name) != NULL) + break; + } + else /* (table[i].type == CGI_MATCH_WORD) */ + { + LOG_INFO("Match all word %s\n", name); + if (!strcmp(table[i].name, name)) break; - name[i] = *p; } - } -} -static http_gci_handler_t cgi_search(const char *name, HttpCGI *table) -{ - for (int i = 0; table[i].name; i++) - { - if (!strcmp(table[i].name, name)) - return table[i].handler; + i++; } - return NULL; + + return table[i].handler; } -static uint8_t tx_buf[2048]; -static char file_name[80]; +static char req_string[80]; -void http_server(struct netconn *server, struct HttpCGI *table) +/** + * Http polling function. + * + * Call this functions to process each client connections. + * + */ +void http_poll(struct netconn *server) { - // SD fat filesystem context - Sd sd; - FATFS fs; - FatFile in_file; struct netconn *client; struct netbuf *rx_buf_conn; char *rx_buf; - u16_t len; - FRESULT result; + uint16_t len; client = netconn_accept(server); if (!client) @@ -125,70 +231,26 @@ void http_server(struct netconn *server, struct HttpCGI *table) netbuf_data(rx_buf_conn, (void **)&rx_buf, &len); if (rx_buf) { - memset(file_name, 0, sizeof(file_name)); - get_fileName(rx_buf, file_name, sizeof(file_name)); + memset(req_string, 0, sizeof(req_string)); + http_getPageName(rx_buf, len, req_string, sizeof(req_string)); - LOG_INFO("Search %s\n", file_name); - if (strlen(file_name) == 0) - strcpy(file_name, HTTP_DEFAULT_PAGE); + LOG_INFO("Search %s\n", req_string); + if (req_string[0] == '\0') + strcpy(req_string, HTTP_DEFAULT_PAGE); - http_gci_handler_t cgi = cgi_search(file_name, table); + http_handler_t cgi = cgi_search(req_string, cgi_table); if (cgi) { - cgi(rx_buf, client); - } - else if (SD_CARD_PRESENT()) - { - bool sd_ok = sd_init(&sd, NULL, 0); - if (sd_ok) + if (cgi(client, req_string, rx_buf, len) < 0) { - LOG_INFO("Mount FAT filesystem.\n"); - result = f_mount(0, &fs); - if (result != FR_OK) - { - LOG_ERR("Mounting FAT volumes error[%d]\n", result); - sd_ok = false; - f_mount(0, NULL); - } - - if (sd_ok) - { - result = fatfile_open(&in_file, file_name, FA_OPEN_EXISTING | FA_READ); - - size_t count = 0; - if (result == FR_OK) - { - LOG_INFO("Opened file '%s' size %ld\n", file_name, in_file.fat_file.fsize); - - http_sendOk(client); - - while (count < in_file.fat_file.fsize) - { - int len = kfile_read(&in_file.fd, tx_buf, sizeof(tx_buf)); - netconn_write(client, tx_buf, len, NETCONN_COPY); - count += len; - } - - kfile_flush(&in_file.fd); - kfile_close(&in_file.fd); - - LOG_INFO("Sent: %d\n", count); - } - else - { - LOG_ERR("Unable to open file: '%s' error[%d]\n", file_name, result); - http_sendFileNotFound(client); - netconn_write(client, http_file_not_found, http_file_not_found_len - 1, NETCONN_NOCOPY); - } - } + LOG_ERR("Internal server error\n"); + http_sendInternalErr(client); + netconn_write(client, http_server_error, http_server_error_len - 1, NETCONN_NOCOPY); } - f_mount(0, NULL); - LOG_INFO("Umount FAT filesystem.\n"); } else { - http_sendFileNotFound(client); - netconn_write(client, http_sd_not_present, http_sd_not_present_len, NETCONN_NOCOPY); + http_callback(client, req_string, rx_buf, len); } } netconn_close(client); @@ -196,3 +258,24 @@ void http_server(struct netconn *server, struct HttpCGI *table) } netconn_delete(client); } + +/** + * Init the http server. + * + * The simply http server call for each client request the default_callback function. The + * user should define this callback to manage the client request, i.e. reading site's page + * from SD card. The user can define the cgi_table, where associate one callback to the user string. + * In this way the user could filter some client request and redirect they to custom callback, i.e. + * the client could request status of the device only loading the particular page name. + * + * \param default_callback fuction that server call for all request, that does'nt match cgi table. + * \param table of callcack to call when client request a particular page. + */ +void http_init(http_handler_t default_callback, struct HttpCGI *table) +{ + ASSERT(default_callback); + + cgi_table = table; + http_callback = default_callback; +} +