
4 changed files with 279 additions and 0 deletions
@ -0,0 +1,91 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Kaspar Schleiser <kaspar@schleiser.de> |
||||
* |
||||
* This file is subject to the terms and conditions of the GNU Lesser |
||||
* General Public License v2.1. See the file LICENSE in the top level |
||||
* directory for more details. |
||||
*/ |
||||
|
||||
/**
|
||||
* @defgroup net_sock_util sock utility functions |
||||
* @ingroup net_sock |
||||
* |
||||
* @brief sock utility function |
||||
* |
||||
* @{ |
||||
* |
||||
* @file |
||||
* @brief sock utility function definitions |
||||
* |
||||
* @author Kaspar Schleiser <kaspar@schleiser.de> |
||||
*/ |
||||
|
||||
#ifndef SOCK_UTIL_H |
||||
#define SOCK_UTIL_H |
||||
|
||||
#ifdef __cplusplus |
||||
extern "C" { |
||||
#endif |
||||
|
||||
|
||||
/**
|
||||
* @brief Format UDP endpoint to string and port |
||||
* |
||||
* @param[in] endpoint endpoint to format |
||||
* @param[out] addr_str where to write address as string |
||||
* @param[out] port where to write prt number as uint16_t |
||||
* |
||||
* @returns number of bytes written to @p addr_str on success |
||||
* @returns <0 otherwise |
||||
*/ |
||||
int sock_udp_ep_fmt(const sock_udp_ep_t *endpoint, char *addr_str, uint16_t *port); |
||||
|
||||
/**
|
||||
* @brief Split url to host:port and url path |
||||
* |
||||
* Will split e.g., "https://host.name:1234/url/path" into |
||||
* "host.name:1234" and "/url/path". |
||||
* |
||||
* @note Caller has to make sure hostport and urlpath can hold the results! |
||||
* Make sure to provide space for SOCK_HOSTPORT_MAXLEN respectively |
||||
* SOCK_URLPATH_MAXLEN bytes. |
||||
* |
||||
* @param[in] url URL to split |
||||
* @param[out] hostport where to write host:port |
||||
* @param[out] urlpath where to write url path |
||||
* |
||||
* @returns 0 on success |
||||
* @returns <0 otherwise |
||||
*/ |
||||
int sock_urlsplit(const char *url, char *hostport, char *urlpath); |
||||
|
||||
/**
|
||||
* @brief Convert string to UDP endpoint |
||||
* |
||||
* Takes eg., "[2001:db8::1]:1234" and converts it into the corresponding UDP |
||||
* endpoint structure. |
||||
* |
||||
* @param[out] ep_out endpoint structure to fill |
||||
* @param[in] str string to read from |
||||
* |
||||
* @returns 0 on success |
||||
* @returns <0 otherwise |
||||
*/ |
||||
int sock_udp_str2ep(sock_udp_ep_t *ep_out, const char *str); |
||||
|
||||
/**
|
||||
* @name helper definitions |
||||
* @{ |
||||
*/ |
||||
#define SOCK_HOSTPORT_MAXLEN (64U) /**< maximum length of host:port part for |
||||
sock_urlsplit() */ |
||||
#define SOCK_URLPATH_MAXLEN (64U) /**< maximum length path for |
||||
sock_urlsplit() */ |
||||
/** @} */ |
||||
|
||||
#ifdef __cplusplus |
||||
} |
||||
#endif |
||||
|
||||
#endif /* SOCK_UTIL_H */ |
||||
/** @} */ |
@ -0,0 +1,2 @@
|
||||
MODULE = sock_util
|
||||
include $(RIOTBASE)/Makefile.base |
@ -0,0 +1,183 @@
|
||||
/*
|
||||
* Copyright (C) 2017 Kaspar Schleiser <kaspar@schleiser.de> |
||||
* |
||||
* This file is subject to the terms and conditions of the GNU Lesser |
||||
* General Public License v2.1. See the file LICENSE in the top level |
||||
* directory for more details. |
||||
*/ |
||||
|
||||
/**
|
||||
* @ingroup net_sock_util |
||||
* @{ |
||||
* @file |
||||
* @brief sock utility functions implementation |
||||
* @author Kaspar Schleiser <kaspar@schleiser.de> |
||||
* @} |
||||
*/ |
||||
|
||||
#include <arpa/inet.h> |
||||
#include <errno.h> |
||||
#include <stdio.h> |
||||
#include <string.h> |
||||
|
||||
#include "net/sock/udp.h" |
||||
#include "net/sock/util.h" |
||||
|
||||
#ifdef RIOT_VERSION |
||||
#include "fmt.h" |
||||
#endif |
||||
|
||||
#define SOCK_HOST_MAXLEN (64U) /**< maximum length of host part for |
||||
sock_udp_str2ep() */ |
||||
|
||||
int sock_udp_ep_fmt(const sock_udp_ep_t *endpoint, char *addr_str, uint16_t *port) |
||||
{ |
||||
void *addr_ptr; |
||||
*addr_str = '\0'; |
||||
|
||||
switch (endpoint->family) { |
||||
#if defined(SOCK_HAS_IPV4) |
||||
case AF_INET: |
||||
{ |
||||
addr_ptr = (void*)&endpoint->addr.ipv4; |
||||
break; |
||||
} |
||||
#endif |
||||
#if defined(SOCK_HAS_IPV6) |
||||
case AF_INET6: |
||||
{ |
||||
addr_ptr = (void*)&endpoint->addr.ipv6; |
||||
break; |
||||
} |
||||
#endif /* else fall through */ |
||||
default: |
||||
return -ENOTSUP; |
||||
} |
||||
|
||||
if (!inet_ntop(endpoint->family, addr_ptr, addr_str, INET6_ADDRSTRLEN)) { |
||||
return 0; |
||||
} |
||||
|
||||
#if defined(SOCK_HAS_IPV6) |
||||
if ((endpoint->family == AF_INET6) && endpoint->netif) { |
||||
#ifdef RIOT_VERSION |
||||
char *tmp = addr_str + strlen(addr_str); |
||||
*tmp++ = '%'; |
||||
tmp += fmt_u16_dec(tmp, endpoint->netif); |
||||
*tmp = '0'; |
||||
#else |
||||
sprintf(addr_str + strlen(addr_str), "%%%4u", endpoint->netif); |
||||
#endif |
||||
} |
||||
#endif |
||||
|
||||
if (port) { |
||||
*port = endpoint->port; |
||||
} |
||||
|
||||
return strlen(addr_str); |
||||
} |
||||
|
||||
static char* _find_hoststart(const char *url) |
||||
{ |
||||
char *urlpos = (char*)url; |
||||
while(*urlpos) { |
||||
if (*urlpos++ == ':') { |
||||
if (strncmp(urlpos, "//", 2) == 0) { |
||||
return urlpos + 2; |
||||
} |
||||
break; |
||||
} |
||||
urlpos++; |
||||
} |
||||
return NULL; |
||||
} |
||||
|
||||
static char* _find_pathstart(const char *url) |
||||
{ |
||||
char *urlpos = (char*)url; |
||||
while(*urlpos) { |
||||
if (*urlpos == '/') { |
||||
return urlpos; |
||||
} |
||||
urlpos++; |
||||
} |
||||
return NULL; |
||||
} |
||||
|
||||
int sock_urlsplit(const char *url, char *hostport, char *urlpath) |
||||
{ |
||||
char *hoststart = _find_hoststart(url); |
||||
if (!hoststart) { |
||||
return -EINVAL; |
||||
} |
||||
|
||||
char *pathstart = _find_pathstart(hoststart); |
||||
if(!pathstart) { |
||||
return -EINVAL; |
||||
} |
||||
|
||||
memcpy(hostport, hoststart, pathstart - hoststart); |
||||
|
||||
size_t pathlen = strlen(pathstart); |
||||
if (pathlen) { |
||||
memcpy(urlpath, pathstart, pathlen); |
||||
} |
||||
else { |
||||
*urlpath = '\0'; |
||||
} |
||||
return 0; |
||||
} |
||||
|
||||
int sock_udp_str2ep(sock_udp_ep_t *ep_out, const char *str) |
||||
{ |
||||
unsigned brackets_flag; |
||||
char *hoststart = (char*)str; |
||||
char *hostend = hoststart; |
||||
|
||||
char hostbuf[SOCK_HOST_MAXLEN]; |
||||
|
||||
memset(ep_out, 0, sizeof(sock_udp_ep_t)); |
||||
|
||||
if (*hoststart == '[') { |
||||
brackets_flag = 1; |
||||
for (hostend = ++hoststart; *hostend && *hostend != ']'; |
||||
hostend++); |
||||
if (! *hostend) { |
||||
/* none found, bail out */ |
||||
return -EINVAL; |
||||
} |
||||
} |
||||
else { |
||||
brackets_flag = 0; |
||||
for (hostend = hoststart; *hostend && *hostend != ':'; |
||||
hostend++); |
||||
} |
||||
|
||||
if (*(hostend + brackets_flag) == ':') { |
||||
ep_out->port = atoi(hostend + brackets_flag + 1); |
||||
} |
||||
|
||||
size_t hostlen = hostend - hoststart; |
||||
if (hostlen >= sizeof(hostbuf)) { |
||||
return -EINVAL; |
||||
} |
||||
|
||||
memcpy(hostbuf, hoststart, hostlen); |
||||
|
||||
hostbuf[hostlen] = '\0'; |
||||
|
||||
if (!brackets_flag) { |
||||
if (inet_pton(AF_INET, hostbuf, &ep_out->addr.ipv4) == 1) { |
||||
ep_out->family = AF_INET; |
||||
return 0; |
||||
} |
||||
} |
||||
#if defined(SOCK_HAS_IPV6) |
||||
if (inet_pton(AF_INET6, hostbuf, ep_out->addr.ipv6) == 1) { |
||||
ep_out->family = AF_INET6; |
||||
return 0; |
||||
} |
||||
#endif |
||||
return -EINVAL; |
||||
} |
Loading…
Reference in new issue