RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

uri_parser: parse interface in IPv6 addresses

Browse Source
This commit is contained in:
Cenk Gündoğan 2020-10-29 14:24:07 +01:00
parent b1146c0f42
commit 9eb6a38a5a
No known key found for this signature in database
GPG Key ID: A3DBC2F744D484D2
2 changed files with 59 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
sys/include/uri_parser.h
View File

@ -41,16 +41,43 @@ extern "C" {
typedef struct { typedef struct {
char *scheme; /**< scheme */ char *scheme; /**< scheme */
char *userinfo; /**< userinfo */ char *userinfo; /**< userinfo */
char *host; /**< host */
/**
* @brief host part
*
* @note for IPv6 addresses, @ref host also includes the brackets
* '[' and ']' as well as the zoneid (with leading '%'), if
* present.
*/
char *host;
/**
* @brief Pointer to the start of the address, if @ref host is an
* IPv6 address and NULL otherwise
*
* @note @ref ipv6addr does not include the brackets '[' and ']'
* and the zoneid part.
*/
char *ipv6addr;
/**
* @brief zoneid if @ref host is IPv6 address, NULL otherwise
*
* @see https://tools.ietf.org/html/rfc6874
*/
char *zoneid;
char *port; /**< port */ char *port; /**< port */
char *path; /**< path */ char *path; /**< path */
char *query; /**< query */ char *query; /**< query */
uint16_t scheme_len; /**< length of @p scheme */ uint16_t scheme_len; /**< length of @ref scheme */
uint16_t userinfo_len; /**< length of @p userinfo */ uint16_t userinfo_len; /**< length of @ref userinfo */
uint16_t host_len; /**< length of @p host */ uint16_t host_len; /**< length of @ref host */
uint16_t port_len; /**< length of @p port */ uint16_t ipv6addr_len; /**< length of @ref ipv6addr */
uint16_t path_len; /**< length of @p path */ uint16_t zoneid_len; /**< length of @ref zoneid */
uint16_t query_len; /**< length of @p query */ uint16_t port_len; /**< length of @ref port */
uint16_t path_len; /**< length of @ref path */
uint16_t query_len; /**< length of @ref query */
} uri_parser_result_t; } uri_parser_result_t;
/** /**

20
sys/uri_parser/uri_parser.c
View File

@ -133,6 +133,25 @@ static char *_consume_authority(uri_parser_result_t *result, char *uri,
if (ipv6_end >= authority_end) { if (ipv6_end >= authority_end) {
return NULL; return NULL;
} }
char *zoneid_start = _strchrb(result->host, ipv6_end, '%');
if (zoneid_start) {
/* skip % */
result->zoneid = zoneid_start + 1;
result->zoneid_len = ipv6_end - result->zoneid;
/* zoneid cannot be empty */
if (result->zoneid_len == 0) {
return NULL;
}
}
/* remove '[', ']', and '%' zoneid from ipv6addr */
result->ipv6addr = result->host + 1;
result->ipv6addr_len = ipv6_end - result->ipv6addr;
if (result->zoneid) {
result->ipv6addr_len -= result->zoneid_len + 1;
}
} }
/* consume port, if available */ /* consume port, if available */
@ -145,6 +164,7 @@ static char *_consume_authority(uri_parser_result_t *result, char *uri,
(result->userinfo || result->port)) { (result->userinfo || result->port)) {
return NULL; return NULL;
} }
/* this includes the '/' */ /* this includes the '/' */
return authority_end; return authority_end;
} }