Diff: modules/pico_http_util.c

Revision:

149:5f4cb161cec3

Parent:

148:969fdb223792

Child:

150:551effcf6a39

--- a/modules/pico_http_util.c	Tue Mar 11 15:34:51 2014 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,186 +0,0 @@
-/*********************************************************************
-   PicoTCP. Copyright (c) 2012 TASS Belgium NV. Some rights reserved.
-   See LICENSE and COPYING for usage.
-
-   Author: Andrei Carp <andrei.carp@tass.be>
- *********************************************************************/
-
-#include <stdint.h>
-#include "pico_config.h"
-#include "pico_stack.h"
-#include "pico_protocol.h"
-#include "pico_http_util.h"
-
-#define TRUE    1
-#define FALSE 0
-
-#define HTTP_PROTO_TOK      "http://"
-#define HTTP_PROTO_LEN      7u
-
-#if defined PICO_SUPPORT_HTTP_CLIENT || defined PICO_SUPPORT_HTTP_SERVER
-
-int pico_itoaHex(uint16_t port, char *ptr)
-{
-    int size = 0;
-    int index;
-
-    /* transform to from number to string [ in backwards ] */
-    while(port)
-    {
-        ptr[size] = (char)(((port & 0xF) < 10) ? ((port & 0xF) + '0') : ((port & 0xF) - 10 + 'a'));
-        port = port >> 4u; /* divide by 16 */
-        size++;
-    }
-    /* invert positions */
-    for(index = 0; index < (size >> 1u); index++)
-    {
-        char c = ptr[index];
-        ptr[index] = ptr[size - index - 1];
-        ptr[size - index - 1] = c;
-    }
-    ptr[size] = '\0';
-    return size;
-}
-
-uint16_t pico_itoa(uint16_t port, char *ptr)
-{
-    uint16_t size = 0;
-    uint16_t index;
-
-    /* transform to from number to string [ in backwards ] */
-    while(port)
-    {
-        ptr[size] = (char)(port % 10 + '0');
-        port = port / 10;
-        size++;
-    }
-    /* invert positions */
-    for(index = 0; index < (size >> 1u); index++)
-    {
-        char c = ptr[index];
-        ptr[index] = ptr[size - index - 1];
-        ptr[size - index - 1] = c;
-    }
-    ptr[size] = '\0';
-    return size;
-}
-
-
-int8_t pico_processURI(const char *uri, struct pico_http_uri *urikey)
-{
-
-    uint16_t lastIndex = 0, index;
-
-    if(!uri || !urikey || uri[0] == '/')
-    {
-        pico_err = PICO_ERR_EINVAL;
-        goto error;
-    }
-
-    /* detect protocol => search for  "://" */
-    if(memcmp(uri, HTTP_PROTO_TOK, HTTP_PROTO_LEN) == 0) /* could be optimized */
-    { /* protocol identified, it is http */
-        urikey->protoHttp = TRUE;
-        lastIndex = HTTP_PROTO_LEN;
-    }
-    else
-    {
-        if(strstr(uri, "://")) /* different protocol specified */
-        {
-            urikey->protoHttp = FALSE;
-            goto error;
-        }
-
-        /* no protocol specified, assuming by default it's http */
-        urikey->protoHttp = TRUE;
-    }
-
-    /* detect hostname */
-    index = lastIndex;
-    while(uri[index] && uri[index] != '/' && uri[index] != ':') index++;
-    if(index == lastIndex)
-    {
-        /* wrong format */
-        urikey->host = urikey->resource = NULL;
-        urikey->port = urikey->protoHttp = 0u;
-
-        goto error;
-    }
-    else
-    {
-        /* extract host */
-        urikey->host = (char *)pico_zalloc((uint32_t)(index - lastIndex + 1));
-
-        if(!urikey->host)
-        {
-            /* no memory */
-            goto error;
-        }
-
-        memcpy(urikey->host, uri + lastIndex, (size_t)(index - lastIndex));
-    }
-
-    if(!uri[index])
-    {
-        /* nothing specified */
-        urikey->port = 80u;
-        urikey->resource = pico_zalloc(2u);
-        urikey->resource[0] = '/';
-        return HTTP_RETURN_OK;
-    }
-    else if(uri[index] == '/')
-    {
-        urikey->port = 80u;
-    }
-    else if(uri[index] == ':')
-    {
-        urikey->port = 0u;
-        index++;
-        while(uri[index] && uri[index] != '/')
-        {
-            /* should check if every component is a digit */
-            urikey->port = (uint16_t)(urikey->port * 10 + (uri[index] - '0'));
-            index++;
-        }
-    }
-
-    /* extract resource */
-    if(!uri[index])
-    {
-        urikey->resource = pico_zalloc(2u);
-        urikey->resource[0] = '/';
-    }
-    else
-    {
-        lastIndex = index;
-        while(uri[index] && uri[index] != '?' && uri[index] != '&' && uri[index] != '#') index++;
-        urikey->resource = (char *)pico_zalloc((size_t)(index - lastIndex + 1));
-
-        if(!urikey->resource)
-        {
-            /* no memory */
-            pico_err = PICO_ERR_ENOMEM;
-            goto error;
-        }
-
-        memcpy(urikey->resource, uri + lastIndex, (size_t)(index - lastIndex));
-    }
-
-    return HTTP_RETURN_OK;
-
-error:
-    if(urikey->resource)
-    {
-        pico_free(urikey->resource);
-        urikey->resource = NULL;
-    }
-
-    if(urikey->host)
-    {
-        pico_free(urikey->host);
-        urikey->host = NULL;
-    }
-
-    return HTTP_RETURN_ERROR;
-}
-#endif