github/wangyu-udp2raw
1
0
Fork 0
mirror of https://github.com/wangyu-/udp2raw.git synced 2025-04-04 02:59:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

use getaddrinfo() for Linux implementation

Browse Source 
simply implementation and support hostname as address

Note: do not use static linking in compilation since this commit,
since getaddrinfo() causes problems with static linking.
Ref:
[1] https://stackoverflow.com/questions/2725255/create-statically-linked-binary-that-uses-getaddrinfo
[2] https://www.linuxquestions.org/questions/programming-9/glibc-warning-concerning-use-of-getaddrinfo-in-static-library-734169
This commit is contained in:
HiGarfield 2022-02-12 03:10:58 +08:00
parent 8ceaf27eda
commit 50d40c86d9
1 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
common.cpp
View File

@ -12,6 +12,12 @@
#include <random>
#include <cmath>
#ifdef UDP2RAW_LINUX
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
#endif
//static int random_number_fd=-1;
int force_socket_buf=0;
@ -21,6 +27,38 @@ int address_t::from_str(char *str)
char ip_addr_str[100];u32_t port;
mylog(log_info,"parsing address: %s\n",str);
#ifdef UDP2RAW_LINUX
char *pos = strrchr(str, ':');
memset(ip_addr_str, 0, sizeof(ip_addr_str));
strncpy(ip_addr_str, str, pos - str);
sscanf(pos + 1, "%u", &port);
struct addrinfo *res;
int ret = getaddrinfo(ip_addr_str, NULL, NULL, &res);
if (ret < 0)
{
mylog(log_error, "invalid addr: %s, %s\n",
ip_addr_str, gai_strerror(ret));
myexit(-1);
}
memcpy(&inner, res->ai_addr, sizeof(*(res->ai_addr)));
if (port > 65535)
{
mylog(log_error, "invalid port: %d\n", port);
myexit(-1);
}
switch (res->ai_family)
{
case AF_INET:
inner.ipv4.sin_port = htons(port);
break;
case AF_INET6:
inner.ipv6.sin6_port = htons(port);
break;
}
freeaddrinfo(res);
#else
int is_ipv6=0;
if(sscanf(str, "[%[^]]]:%u", ip_addr_str,&port)==2)
{
@ -87,6 +125,7 @@ int address_t::from_str(char *str)
myexit(-1);
}
}
#endif
return 0;
}
@ -95,6 +134,17 @@ int address_t::from_str_ip_only(char * str)
{
clear();
#ifdef UDP2RAW_LINUX
struct addrinfo *res;
int ret = getaddrinfo(str, NULL, NULL, &res);
if (ret < 0)
{
mylog(log_error, "invalid addr: %s, %s\n",
str, gai_strerror(ret));
myexit(-1);
}
memcpy(&inner, res->ai_addr, sizeof(*(res->ai_addr)));
#else
u32_t type;
if(strchr(str,':')==NULL)
@ -128,6 +178,7 @@ int address_t::from_str_ip_only(char * str)
mylog(log_error,"ip_addr %s is invalid, %d\n",str,ret);
myexit(-1);
}
#endif
return 0;
}