From 214cc18ef97fcaa0a4c3746e183caf5820bc811b Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Wed, 22 Nov 2006 06:06:36 +0000 Subject: Add first draft XML based service record registration --- common/sdp-xml.c | 354 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 328 insertions(+), 26 deletions(-) (limited to 'common/sdp-xml.c') diff --git a/common/sdp-xml.c b/common/sdp-xml.c index ee5601ee..8b290b88 100644 --- a/common/sdp-xml.c +++ b/common/sdp-xml.c @@ -31,17 +31,20 @@ #include #include #include +#include #include #include +#include "logging.h" + #include "sdp-xml.h" -#define STRBUFSIZE 256 +#define STRBUFSIZE 1024 #define MAXINDENT 64 static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, - void *data, void (*appender) (void *, const char *)) + void *data, void (*appender)(void *, const char *)) { int i, hex; char buf[STRBUFSIZE]; @@ -70,12 +73,14 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, appender(data, indent); appender(data, "\n"); break; + case SDP_BOOL: appender(data, indent); appender(data, "val.uint8 ? "true" : "false"); appender(data, "\" />\n"); break; + case SDP_UINT8: appender(data, indent); appender(data, "\n"); break; + case SDP_UINT16: appender(data, indent); appender(data, "\n"); break; + case SDP_UINT32: appender(data, indent); appender(data, "\n"); break; + case SDP_UINT64: appender(data, indent); appender(data, "\n"); break; + case SDP_UINT128: appender(data, indent); appender(data, "\n"); break; + case SDP_INT8: appender(data, indent); appender(data, "\n"); break; + case SDP_INT16: appender(data, indent); appender(data, "\n"); break; + case SDP_INT32: appender(data, indent); appender(data, "\n"); break; + case SDP_INT64: appender(data, indent); appender(data, "\n"); break; + case SDP_INT128: appender(data, indent); appender(data, "\n"); break; + case SDP_UUID16: appender(data, indent); appender(data, "val.uuid.value.uuid16); + snprintf(buf, STRBUFSIZE - 1, "0x%04x", value->val.uuid.value.uuid16); appender(data, buf); appender(data, "\" />\n"); break; + case SDP_UUID32: appender(data, indent); appender(data, "val.uuid.value.uuid32); + snprintf(buf, STRBUFSIZE - 1, "0x%08x", value->val.uuid.value.uuid32); appender(data, buf); appender(data, "\" />\n"); break; + case SDP_UUID128: appender(data, indent); appender(data, "\n"); break; + case SDP_TEXT_STR8: case SDP_TEXT_STR16: case SDP_TEXT_STR32: @@ -256,7 +272,7 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, This is safe for Normal strings, but not hex encoded data */ for (i = 0; i < (value->unitSize-1); i++) - sprintf(&strBuf[i * sizeof (char) * 2], + sprintf(&strBuf[i*sizeof(char)*2], "%02x", (unsigned char) value->val.str[i]); @@ -306,6 +322,7 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, free(strBuf); break; } + case SDP_URL_STR8: case SDP_URL_STR16: case SDP_URL_STR32: @@ -314,6 +331,7 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, appender(data, value->val.str); appender(data, "\" />\n"); break; + case SDP_SEQ8: case SDP_SEQ16: case SDP_SEQ32: @@ -321,13 +339,13 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, appender(data, "\n"); convert_raw_data_to_xml(value->val.dataseq, - indent_level + 1, data, - appender); + indent_level + 1, data, appender); appender(data, indent); appender(data, "\n"); break; + case SDP_ALT8: case SDP_ALT16: case SDP_ALT32: @@ -336,25 +354,20 @@ static void convert_raw_data_to_xml(sdp_data_t *value, int indent_level, appender(data, "\n"); convert_raw_data_to_xml(value->val.dataseq, - indent_level + 1, data, - appender); + indent_level + 1, data, appender); appender(data, indent); appender(data, "\n"); - break; - default: break; } - convert_raw_data_to_xml(value->next, indent_level, data, - appender); + convert_raw_data_to_xml(value->next, indent_level, data, appender); } -struct conversion_data -{ +struct conversion_data { void *data; - void (*appender) (void *data, const char *); + void (*appender)(void *data, const char *); }; static void convert_raw_attr_to_xml_func(void *val, void *data) @@ -369,8 +382,7 @@ static void convert_raw_attr_to_xml_func(void *val, void *data) cd->appender(cd->data, buf); if (data) - convert_raw_data_to_xml(value, 2, cd->data, - cd->appender); + convert_raw_data_to_xml(value, 2, cd->data, cd->appender); else cd->appender(cd->data, "\t\tNULL\n"); @@ -378,13 +390,13 @@ static void convert_raw_attr_to_xml_func(void *val, void *data) } /* - Will convert the sdp record to XML. The appender and data can be used - to control where to output the record (e.g. file or a data buffer). The - appender will be called repeatedly with data and the character buffer - (containing parts of the generated XML) to append. -*/ + * Will convert the sdp record to XML. The appender and data can be used + * to control where to output the record (e.g. file or a data buffer). The + * appender will be called repeatedly with data and the character buffer + * (containing parts of the generated XML) to append. + */ void convert_sdp_record_to_xml(sdp_record_t *rec, - void *data, void (*appender) (void *, const char *)) + void *data, void (*appender)(void *, const char *)) { struct conversion_data cd; @@ -399,3 +411,293 @@ void convert_sdp_record_to_xml(sdp_record_t *rec, appender(data, "\n"); } } + +static sdp_data_t *sdp_xml_parse_uuid128(const char *data) +{ + uint128_t val; + int i; + int j; + + char buf[3]; + + memset(&val, 0, sizeof(val)); + + buf[2] = '\0'; + + for (j = 0, i = 0; i < strlen(data);) { + if (data[i] == '-') { + i++; + continue; + } + + buf[0] = data[i]; + buf[1] = data[i + 1]; + + val.data[j++] = strtoul(buf, 0, 16); + i += 2; + } + + return sdp_data_alloc(SDP_UUID128, &val); +} + +sdp_data_t *sdp_xml_parse_uuid(const char *data) +{ + int len; + char *endptr; + uint32_t val; + uint16_t val2 = val; + + len = strlen(data); + + if (len == 36) + return sdp_xml_parse_uuid128(data); + + val = strtoll(data, &endptr, 16); + + /* Couldn't parse */ + if (*endptr != '\0') + return NULL; + + if (val > USHRT_MAX) + return sdp_data_alloc(SDP_UUID32, &val); + + return sdp_data_alloc(SDP_UUID16, &val2); + + /* Should never get here */ + return NULL; +} + +sdp_data_t *sdp_xml_parse_int(const char * data, uint8_t dtd) +{ + char *endptr; + sdp_data_t *ret = NULL; + + switch (dtd) { + case SDP_BOOL: + { + uint8_t val = 0; + + if (!strcmp("true", data)) { + val = 1; + } + + else if (!strcmp("false", data)) { + val = 0; + } + else { + return NULL; + } + + ret = sdp_data_alloc(dtd, &val); + break; + } + + case SDP_INT8: + { + int8_t val = strtoul(data, &endptr, 0); + + /* Failed to parse */ + if ((endptr != data) && (*endptr != '\0')) + return NULL; + + ret = sdp_data_alloc(dtd, &val); + break; + } + + case SDP_UINT8: + { + uint8_t val = strtoul(data, &endptr, 0); + + /* Failed to parse */ + if ((endptr != data) && (*endptr != '\0')) + return NULL; + + ret = sdp_data_alloc(dtd, &val); + break; + } + + case SDP_INT16: + { + int16_t val = strtoul(data, &endptr, 0); + + /* Failed to parse */ + if ((endptr != data) && (*endptr != '\0')) + return NULL; + + ret = sdp_data_alloc(dtd, &val); + break; + } + + case SDP_UINT16: + { + uint16_t val = strtoul(data, &endptr, 0); + + /* Failed to parse */ + if ((endptr != data) && (*endptr != '\0')) + return NULL; + + ret = sdp_data_alloc(dtd, &val); + break; + } + + case SDP_INT32: + { + int32_t val = strtoul(data, &endptr, 0); + + /* Failed to parse */ + if ((endptr != data) && (*endptr != '\0')) + return NULL; + + ret = sdp_data_alloc(dtd, &val); + break; + } + + case SDP_UINT32: + { + uint32_t val = strtoul(data, &endptr, 0); + + /* Failed to parse */ + if ((endptr != data) && (*endptr != '\0')) + return NULL; + + ret = sdp_data_alloc(dtd, &val); + break; + } + + case SDP_INT64: + { + int64_t val = strtoull(data, &endptr, 0); + + /* Failed to parse */ + if ((endptr != data) && (*endptr != '\0')) + return NULL; + + ret = sdp_data_alloc(dtd, &val); + break; + } + + case SDP_UINT64: + { + uint64_t val = strtoull(data, &endptr, 0); + + /* Failed to parse */ + if ((endptr != data) && (*endptr != '\0')) + return NULL; + + ret = sdp_data_alloc(dtd, &val); + break; + } + + case SDP_INT128: + case SDP_UINT128: + { + uint128_t val; + int i = 0; + char buf[3]; + + buf[2] = '\0'; + + for (; i < 32; i += 2) { + buf[0] = data[i]; + buf[1] = data[i + 1]; + + val.data[i] = strtoul(buf, 0, 16); + } + + ret = sdp_data_alloc(dtd, &val); + break; + } + + }; + + return ret; +} + +static sdp_data_t *sdp_xml_parse_url_with_size(const char *data, uint8_t dtd) +{ + return sdp_data_alloc(dtd, data); +} + +sdp_data_t *sdp_xml_parse_url(const char *data) +{ + uint8_t dtd = SDP_URL_STR8; + + if (strlen(data) > UCHAR_MAX) + dtd = SDP_URL_STR16; + + return sdp_xml_parse_url_with_size(data, dtd); +} + +static char *sdp_xml_parse_text_decode(const char *data, char encoding, uint32_t *length) +{ + int len = strlen(data); + char *text; + + if (encoding == SDP_XML_ENCODING_NORMAL) { + text = strdup(data); + *length = len; + } else { + char buf[3], *decoded; + int i; + + decoded = malloc((len >> 1) + 1); + + /* Ensure the string is a power of 2 */ + len = (len >> 1) << 1; + + buf[2] = '\0'; + + for (i = 0; i < len; i += 2) { + buf[0] = data[i]; + buf[1] = data[i + 1]; + + decoded[i >> 1] = strtoul(buf, 0, 16); + } + + decoded[len >> 1] = '\0'; + text = decoded; + *length = len >> 1; + } + + return text; +} + +#if 0 +static sdp_data_t *sdp_xml_parse_text_with_size(const char *data, char encoding, uint8_t dtd) +{ + char *text; + uint32_t length; + sdp_data_t *ret; + + text = sdp_xml_parse_text_decode(data, encoding, &length); + ret = sdp_data_alloc_with_length(dtd, text, length); + + debug("Unit size %d length %d: -->%s<--\n", ret->unitSize, length, text); + + return ret; +} +#endif + +sdp_data_t *sdp_xml_parse_text(const char *data, char encoding) +{ + uint8_t dtd = SDP_TEXT_STR8; + char *text; + uint32_t length; + sdp_data_t *ret; + + text = sdp_xml_parse_text_decode(data, encoding, &length); + + if (length > UCHAR_MAX) + dtd = SDP_TEXT_STR16; + + ret = sdp_data_alloc_with_length(dtd, text, length); + + debug("Unit size %d length %d: -->%s<--\n", ret->unitSize, length, text); + + return ret; +} + +sdp_data_t *sdp_xml_parse_nil(const char *data) +{ + return sdp_data_alloc(SDP_DATA_NIL, 0); +} -- cgit