X-Git-Url: https://gitweb.ps.run/matrix_esp_thesis/blobdiff_plain/5cb22046a33f24c1a696990f95e13d534efef497..eab8bbd317aa9887fd09c38a963ee80660d75ca0:/src/matrix_http_mongoose.c diff --git a/src/matrix_http_mongoose.c b/src/matrix_http_mongoose.c index 3faefa9..452e26c 100644 --- a/src/matrix_http_mongoose.c +++ b/src/matrix_http_mongoose.c @@ -1,4 +1,5 @@ #include "matrix.h" + #include #include #include @@ -6,6 +7,7 @@ #include //#define HTTP_DATA_SIZE 1024 +#define AUTHORIZATION_HEADER_LEN 64 typedef struct MatrixHttpConnection { struct mg_mgr mgr; @@ -34,12 +36,17 @@ MatrixHttpCallback( // If s_url is https://, tell client connection to use TLS if (mg_url_is_ssl(client->server)) { - struct mg_tls_opts opts = {.srvname = host}; + static struct mg_tls_opts opts; + opts.srvname = host; mg_tls_init(c, &opts); } conn->connection = c; conn->connected = true; + } + if (ev == MG_EV_HTTP_CHUNK) + { + } if (ev == MG_EV_HTTP_MSG) { @@ -47,9 +54,18 @@ MatrixHttpCallback( struct mg_http_message *hm = (struct mg_http_message *)ev_data; // memcpy_s(client->data, 1024, hm->message.ptr, hm->message.len); // client->dataLen = hm->message.len; - memcpy_s(conn->data, conn->dataCap, hm->body.ptr, hm->body.len); + memcpy(conn->data, hm->body.ptr, hm->body.len); + // memcpy_s(conn->data, conn->dataCap, hm->body.ptr, hm->body.len); + conn->data[hm->body.len] = '\0'; conn->dataLen = hm->body.len; conn->dataReceived = true; + + //printf("received[%d]:\n%.*s\n", conn->dataLen, conn->dataLen, conn->data); + } + if (ev == MG_EV_CLOSE) + { + conn->connection = NULL; + conn->connected = false; } } @@ -64,7 +80,18 @@ MatrixHttpInit( mg_mgr_init(&conn->mgr); - mg_http_connect(&conn->mgr, client->server, MatrixHttpCallback, client); + return MatrixHttpConnect(client); +} + +bool +MatrixHttpConnect( + MatrixClient * client) +{ + MatrixHttpConnection * conn = + (MatrixHttpConnection *)client->httpUserData; + + //struct mg_connection * c = + mg_http_connect(&conn->mgr, client->server, MatrixHttpCallback, client); while (! conn->connected) mg_mgr_poll(&conn->mgr, 1000); @@ -89,20 +116,43 @@ bool MatrixHttpGet( MatrixClient * client, const char * url, - char * outResponseBuffer, int outResponseCap, int * outResponseLen) + char * outResponseBuffer, int outResponseCap, + bool authenticated) { MatrixHttpConnection * conn = (MatrixHttpConnection *)client->httpUserData; + if (! conn->connected) + MatrixHttpConnect(client); conn->dataReceived = false; struct mg_str host = mg_url_host(client->server); + static char authorizationHeader[AUTHORIZATION_HEADER_LEN]; + if (authenticated) + sprintf(authorizationHeader, + "Authorization: Bearer %s\r\n", client->accessToken); + // sprintf_s(authorizationHeader, AUTHORIZATION_HEADER_LEN, + // "Authorization: Bearer %s\r\n", client->accessToken); + else + authorizationHeader[0] = '\0'; + + printf( + "GET %s HTTP/1.1\r\n" + "Host: %.*s\r\n" + "%s" + "\r\n", + url, + host.len, host.ptr, + authorizationHeader); + mg_printf(conn->connection, "GET %s HTTP/1.1\r\n" "Host: %.*s\r\n" + "%s" "\r\n", url, - host.len, host.ptr); + host.len, host.ptr, + authorizationHeader); conn->data = outResponseBuffer; conn->dataCap = outResponseCap; @@ -110,8 +160,6 @@ MatrixHttpGet( while (! conn->dataReceived) mg_mgr_poll(&conn->mgr, 1000); - *outResponseLen = conn->dataLen; - return conn->dataReceived; } @@ -119,18 +167,44 @@ bool MatrixHttpPost( MatrixClient * client, const char * url, - char * requestBuffer, int requestLen, - char * outResponseBuffer, int outResponseCap, int * outResponseLen) + const char * requestBuffer, + char * outResponseBuffer, int outResponseCap, + bool authenticated) { MatrixHttpConnection * conn = (MatrixHttpConnection *)client->httpUserData; + if (! conn->connected) + MatrixHttpConnect(client); conn->dataReceived = false; struct mg_str host = mg_url_host(client->server); + static char authorizationHeader[AUTHORIZATION_HEADER_LEN]; + if (authenticated) + sprintf(authorizationHeader, + "Authorization: Bearer %s\r\n", client->accessToken); + else + authorizationHeader[0] = '\0'; + + printf( + "POST %s HTTP/1.0\r\n" + "Host: %.*s\r\n" + "%s" + "Content-Type: application/json\r\n" + "Content-Length: %d\r\n" + "\r\n" + "%s" + "\r\n", + url, + host.len, host.ptr, + authorizationHeader, + strlen(requestBuffer), + requestBuffer); + mg_printf(conn->connection, "POST %s HTTP/1.0\r\n" "Host: %.*s\r\n" + "%s" "Content-Type: application/json\r\n" "Content-Length: %d\r\n" "\r\n" @@ -138,7 +212,8 @@ MatrixHttpPost( "\r\n", url, host.len, host.ptr, - requestLen, + authorizationHeader, + strlen(requestBuffer), requestBuffer); conn->data = outResponseBuffer; @@ -147,7 +222,68 @@ MatrixHttpPost( while (! conn->dataReceived) mg_mgr_poll(&conn->mgr, 1000); - *outResponseLen = conn->dataLen; + return conn->dataReceived; +} + +bool +MatrixHttpPut( + MatrixClient * client, + const char * url, + const char * requestBuffer, + char * outResponseBuffer, int outResponseCap, + bool authenticated) +{ + MatrixHttpConnection * conn = (MatrixHttpConnection *)client->httpUserData; + if (! conn->connected) + MatrixHttpConnect(client); + + conn->dataReceived = false; + + struct mg_str host = mg_url_host(client->server); + + static char authorizationHeader[AUTHORIZATION_HEADER_LEN]; + if (authenticated) + sprintf(authorizationHeader, + "Authorization: Bearer %s\r\n", client->accessToken); + else + authorizationHeader[0] = '\0'; + + + printf( + "PUT %s HTTP/1.0\r\n" + "Host: %.*s\r\n" + "%s" + "Content-Type: application/json\r\n" + "Content-Length: %d\r\n" + "\r\n" + "%s" + "\r\n", + url, + host.len, host.ptr, + authorizationHeader, + strlen(requestBuffer), + requestBuffer); + + mg_printf(conn->connection, + "PUT %s HTTP/1.0\r\n" + "Host: %.*s\r\n" + "%s" + "Content-Type: application/json\r\n" + "Content-Length: %d\r\n" + "\r\n" + "%s" + "\r\n", + url, + host.len, host.ptr, + authorizationHeader, + strlen(requestBuffer), + requestBuffer); + + conn->data = outResponseBuffer; + conn->dataCap = outResponseCap; + + while (! conn->dataReceived) + mg_mgr_poll(&conn->mgr, 1000); return conn->dataReceived; -} \ No newline at end of file +}