diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inetcat.c | 25 | ||||
| -rw-r--r-- | tools/iproxy.c | 21 |
2 files changed, 14 insertions, 32 deletions
diff --git a/tools/inetcat.c b/tools/inetcat.c index 220a8a7..906b5c9 100644 --- a/tools/inetcat.c +++ b/tools/inetcat.c @@ -224,25 +224,16 @@ int main(int argc, char **argv) int devfd = -1; if (dev->conn_type == CONNECTION_TYPE_NETWORK) { - unsigned char saddr_[32]; - memset(saddr_, '\0', sizeof(saddr_)); - struct sockaddr* saddr = (struct sockaddr*)&saddr_[0]; - if (dev->conn_data[1] == 0x02) { // AF_INET - saddr->sa_family = AF_INET; - memcpy(&saddr->sa_data[0], (uint8_t*)dev->conn_data+2, 14); - } - else if (dev->conn_data[1] == 0x1E) { //AF_INET6 (bsd) + struct sockaddr_storage saddr_storage; + struct sockaddr* saddr = (struct sockaddr*)&saddr_storage; + /* conn_data holds the address in the native sockaddr layout */ + memcpy(saddr, dev->conn_data, sizeof(saddr_storage)); + if (saddr->sa_family != AF_INET #ifdef AF_INET6 - saddr->sa_family = AF_INET6; - memcpy(&saddr->sa_data[0], (uint8_t*)dev->conn_data+2, 26); -#else - fprintf(stderr, "ERROR: Got an IPv6 address but this system doesn't support IPv6\n"); - free(dev_list); - return 1; + && saddr->sa_family != AF_INET6 #endif - } - else { - fprintf(stderr, "Unsupported address family 0x%02x\n", dev->conn_data[1]); + ) { + fprintf(stderr, "Unsupported address family 0x%02x\n", saddr->sa_family); free(dev_list); return 1; } diff --git a/tools/iproxy.c b/tools/iproxy.c index d4c7d06..d411103 100644 --- a/tools/iproxy.c +++ b/tools/iproxy.c @@ -131,23 +131,14 @@ static void *acceptor_thread(void *arg) struct sockaddr_storage saddr_storage; struct sockaddr* saddr = (struct sockaddr*)&saddr_storage; - if (dev->conn_data[1] == 0x02) { // AF_INET - saddr->sa_family = AF_INET; - memcpy(&saddr->sa_data[0], (uint8_t*)dev->conn_data+2, 14); - } - else if (dev->conn_data[1] == 0x1E) { //AF_INET6 (bsd) + /* conn_data holds the address in the native sockaddr layout */ + memcpy(saddr, dev->conn_data, sizeof(saddr_storage)); + if (saddr->sa_family != AF_INET #ifdef AF_INET6 - saddr->sa_family = AF_INET6; - /* copy the address and the host dependent scope id */ - memcpy(&saddr->sa_data[0], (uint8_t*)dev->conn_data+2, 26); -#else - fprintf(stderr, "ERROR: Got an IPv6 address but this system doesn't support IPv6\n"); - CDATA_FREE(cdata); - return NULL; + && saddr->sa_family != AF_INET6 #endif - } - else { - fprintf(stderr, "Unsupported address family 0x%02x\n", dev->conn_data[1]); + ) { + fprintf(stderr, "Unsupported address family 0x%02x\n", saddr->sa_family); CDATA_FREE(cdata); return NULL; } |
