httpp.c,v

版本控制CVS资源库转换成SVN库的转换程序

		avl_delete(parser->vars, (void *)var, _free_vars);
		avl_insert(parser->vars, (void *)var);
	}
d476 2
a477 2
	http_var_t var;
	http_var_t *found;
d479 2
a480 2
	var.name = name;
	var.value = NULL;
d482 4
a485 4
	if (avl_get_by_key(parser->vars, (void *)&var, (void **)&found) == 0)
		return found->value;
	else
		return NULL;
d490 1
a490 1
	http_var_t *var;
d492 2
a493 2
	if (name == NULL || value == NULL)
		return;
d495 2
a496 2
	var = (http_var_t *)malloc(sizeof(http_var_t));
	if (var == NULL) return;
d498 9
a506 9
	var->name = strdup(name);
	var->value = url_escape(value);

	if (httpp_get_query_param(parser, name) == NULL) {
		avl_insert(parser->queryvars, (void *)var);
	} else {
		avl_delete(parser->queryvars, (void *)var, _free_vars);
		avl_insert(parser->queryvars, (void *)var);
	}
d511 2
a512 2
	http_var_t var;
	http_var_t *found;
d514 2
a515 2
	var.name = name;
	var.value = NULL;
d517 4
a520 4
	if (avl_get_by_key(parser->queryvars, (void *)&var, (void **)&found) == 0)
		return found->value;
	else
		return NULL;
d525 7
a531 7
	parser->req_type = httpp_req_none;
	if (parser->uri)
		free(parser->uri);
	parser->uri = NULL;
	avl_tree_free(parser->vars, _free_vars);
	avl_tree_free(parser->queryvars, _free_vars);
	parser->vars = NULL;
d536 2
a537 2
	httpp_clear(parser);
	free(parser);
d542 3
a544 3
	long i;
	for (i = 0; i < strlen(str); i++)
		str[i] = tolower(str[i]);
d546 1
a546 1
	return str;
d551 1
a551 1
	http_var_t *vara, *varb;
d553 2
a554 2
	vara = (http_var_t *)a;
	varb = (http_var_t *)b;
d556 1
a556 1
	return strcmp(vara->name, varb->name);
d561 1
a561 1
	http_var_t *var;
d563 1
a563 1
	var = (http_var_t *)key;
d565 5
a569 5
	if (var->name)
		free(var->name);
	if (var->value)
		free(var->value);
	free(var);
d571 1
a571 1
	return 1;
@


1.16
log
@include the automake config.h file if the application defines one
@
text
@d16 1
a16 1
#include "avl.h"
@


1.15
log
@Set another parameter in the icy protocol parse that logging expects
@
text
@d6 4
@


1.14
log
@Added support for shoutcast login protocol (ewww...)
@
text
@d299 1
@


1.13
log
@Use gnu archive ACX_PTHREAD macro to figure out how to compile thread support.
Also make it possible to build libshout without threads, albeit without locking
in the resolver or avl trees.
New option --disable-pthread too.
@
text
@d273 36
d387 4
a390 2
	} else
		parser->uri = NULL;
@


1.12
log
@Fix some warnings, fix cflags.
@
text
@a11 1
#include "thread.h"
@


1.11
log
@Indentation again, don't mind me
@
text
@d58 2
a59 1
	int i, lines = 0;
@


1.10
log
@Make indentation consistent before doing other work
@
text
@d472 1
a472 1
    var.value = NULL;
@


1.9
log
@mp3 metadata complete. Still untested.
@
text
@d43 1
a43 1
    parser->queryvars = avl_tree_new(_compare_vars, NULL);
d122 4
a125 4
    char *data;
    char *line[MAX_HEADERS];
    int lines, slen,i, whitespace=0, where=0,code;
    char *version=NULL, *resp_code=NULL, *message=NULL;
d127 2
a128 2
    if(http_data == NULL)
        return 0;
d134 1
a134 1
    data[len] = 0;
d136 1
a136 1
    lines = split_headers(data, len, line);
d138 20
a157 22
    /* In this case, the first line contains:
     * VERSION RESPONSE_CODE MESSAGE, such as
     * HTTP/1.0 200 OK
     */
    slen = strlen(line[0]);
    version = line[0];
    for(i=0; i < slen; i++) {
        if(line[0][i] == ' ') {
            line[0][i] = 0;
            whitespace = 1;
        }
        else if(whitespace) {
            whitespace = 0;
            where++;
            if(where == 1)
                resp_code = &line[0][i];
            else {
                message = &line[0][i];
                break;
            }
        }
    }
d159 4
a162 10
    if(version == NULL || resp_code == NULL || message == NULL) {
        free(data);
        return 0;
    }

    httpp_setvar(parser, HTTPP_VAR_ERROR_CODE, resp_code);
    code = atoi(resp_code);
    if(code < 200 || code >= 300) {
        httpp_setvar(parser, HTTPP_VAR_ERROR_MESSAGE, message);
    }
d164 7
a170 1
    httpp_setvar(parser, HTTPP_VAR_URI, uri);
d173 1
a173 1
    parse_headers(parser, line, lines);
d182 8
a189 8
    if(c >= '0' && c <= '9')
        return c - '0';
    else if(c >= 'A' && c <= 'F')
        return c - 'A' + 10;
    else if(c >= 'a' && c <= 'f')
        return c - 'a' + 10;
    else
        return -1;
d194 39
a232 39
    int len = strlen(src);
    unsigned char *decoded;
    int i;
    char *dst;
    int done = 0;

    decoded = calloc(1, len + 1);

    dst = decoded;

    for(i=0; i < len; i++) {
        switch(src[i]) {
            case '%':
                if(i+2 >= len) {
                    free(decoded);
                    return NULL;
                }
                if(hex(src[i+1]) == -1 || hex(src[i+2]) == -1 ) {
                    free(decoded);
                    return NULL;
                }

                *dst++ = hex(src[i+1]) * 16  + hex(src[i+2]);
                i+= 2;
                break;
            case '#':
                done = 1;
                break;
            case 0:
                free(decoded);
                return NULL;
                break;
            default:
                *dst++ = src[i];
                break;
        }
        if(done)
            break;
    }
d234 1
a234 1
    *dst = 0; /* null terminator */
d236 1
a236 1
    return decoded;
d242 29
a270 30
    int len;
    int i=0;
    char *key = query;
    char *val=NULL;

    if(!query || !*query)
        return;

    len = strlen(query);

    while(i<len) {
        switch(query[i]) {
            case '&':
                query[i] = 0;
                if(val && key) {
                    httpp_set_query_param(parser, key, val);
                }
                key = query+i+1;
                break;
            case '=':
                query[i] = 0;
                val = query+i+1;
                break;
        }
        i++;
    }

    if(val && key) {
        httpp_set_query_param(parser, key, val);
    }
d282 1
a282 1
    int whitespace, where, slen;
d291 1
a291 1
    data[len] = 0;
d293 1
a293 1
    lines = split_headers(data, len, line);
d342 7
a348 8
	if (uri != NULL && strlen(uri) > 0) 
    {
        char *query;
        if((query = strchr(uri, '?')) != NULL) {
            *query = 0;
            query++;
            parse_query(parser, query);
        }
d351 1
a351 2
    }
	else
d396 1
a396 1
    if (parser->uri != NULL) {
d403 1
a403 1
    parse_headers(parser, line, lines);
d437 1
a437 1
    var.value = NULL;
d493 2
a494 2
    httpp_clear(parser);
    free(parser);
@


1.8
log
@bugfixes for httpp_parse_response
@
text
@d43 1
d182 94
d345 9
a353 1
	if (uri != NULL && strlen(uri) > 0)
d355 1
d442 1
a442 1
        var.value = NULL;
d450 35
d492 1
@


1.7
log
@Cleaned up version of Ciaran Anscomb's relaying patch.
@
text
@d165 1
a168 2
        free(data);
        return 0;
d172 1
a172 1
	httpp_setvar(parser, HTTPP_VAR_REQ_TYPE, "RELAY");
@


1.6
log
@Memory leaks. Lots of little ones.
@
text
@d52 1
a52 1
int httpp_parse(http_parser_t *parser, char *http_data, unsigned long len)
a53 21
	char *data, *tmp;
	char *line[MAX_HEADERS]; /* limited to 32 lines, should be more than enough */
	int i, l, retlen;
	int lines;
	char *req_type = NULL;
	char *uri = NULL;
	char *version = NULL;
	char *name = NULL;
	char *value = NULL;
	int whitespace, where;
	int slen;

	if (http_data == NULL)
		return 0;

	/* make a local copy of the data, including 0 terminator */
	data = (char *)malloc(len+1);
	if (data == NULL) return 0;
	memcpy(data, http_data, len);
    data[len] = 0;

d57 1
a57 1
	lines = 0;
d75 128
a202 1
	retlen = i;
d298 1
a298 1
        if (parser->uri != NULL) {
d305 1
a305 31
	/* parse the name: value lines. */
	for (l = 1; l < lines; l++) {
		where = 0;
		whitespace = 0;
		name = line[l];
		value = NULL;
		slen = strlen(line[l]);
		for (i = 0; i < slen; i++) {
			if (line[l][i] == ':') {
				whitespace = 1;
				line[l][i] = '\0';
			} else {
				if (whitespace) {
					whitespace = 0;
					while (i < slen && line[l][i] == ' ')
						i++;

					if (i < slen)
						value = &line[l][i];
					
					break;
				}
			}
		}
		
		if (name != NULL && value != NULL) {
			httpp_setvar(parser, _lowercase(name), value);
			name = NULL; 
			value = NULL;
		}
	}
d309 1
a309 1
	return retlen;
@


1.5
log
@Buffer overflows.

Requires a change to the format plugin interface - jack: if you want this
done differently, feel free to change it (or ask me to).
@
text
@d271 1
a271 1
void httpp_destroy(http_parser_t *parser)
d279 6
@


1.4
log
@Bunch of fixes:

 - connections are now matched to format plugins based on content-type headers,
   and are rejected if there isn't a format handler for that content-type, or
   there is no content-type at all.
 - format_vorbis now handles pages with granulepos of -1 in the headers
   correctly (this happens if the headers are fairly large, because of
   many comments, for example).
 - various #include fixes.
 - buffer overflow in httpp.c fixed.
@
text
@d6 2
d20 2
d55 1
a55 1
	char *line[32]; /* limited to 32 lines, should be more than enough */
d80 1
a80 1
	for (i = 0; i < len; i++) {
@


1.3
log
@Thanks to Akos Maroy <darkeye@@tyrell.hu> for this.  These variables need to
be uppercase always in order to comply with the HTTP specification.
While not a problem internal to icecast, they were slipping into the log
files and breaking some less-than-robust parsers.
@
text
@d65 2
a66 2
	/* make a local copy of the data */
	data = (char *)malloc(len);
d69 1
d81 3
a83 3
			if (i + 1 < len)
				if (data[i + 1] == '\n' || data[i + 1] == '\r') {
					data[i] = '\0';
a84 3
				}
			data[i] = '\0';
			if (i < len - 1)
d86 1
@


1.2
log
@Win32 compatibility courtesy of Oddsock.
@
text
@d150 1
a150 1
			httpp_setvar(parser, HTTPP_VAR_PROTOCOL, _lowercase(version));
d164 1
a164 1
			httpp_setvar(parser, HTTPP_VAR_REQ_TYPE, "get");
d167 1
a167 1
			httpp_setvar(parser, HTTPP_VAR_REQ_TYPE, "post");
d170 1
a170 1
			httpp_setvar(parser, HTTPP_VAR_REQ_TYPE, "head");
d173 1
a173 1
			httpp_setvar(parser, HTTPP_VAR_REQ_TYPE, "source");
d176 1
a176 1
			httpp_setvar(parser, HTTPP_VAR_REQ_TYPE, "play");
d179 1
a179 1
			httpp_setvar(parser, HTTPP_VAR_REQ_TYPE, "stats");
@


1.1
log
@Initial revision
@
text
@d14 4
d54 5
a58 4
	char *req_type;
	char *uri;
	char *version;
	char *name, *value;
@


1.1.1.1
log
@move to cvs
@
text
@@