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

use getaddrinfo() to parse address

Browse Source 
simplify implementation and support hostname as address

Note: do not use static linking in compilation after 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 391839fb13
2 changed files with 23 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
common.cpp
View File

@ -18,116 +18,42 @@ int force_socket_buf=0;
int address_t::from_str(char *str) int address_t::from_str(char *str)
{ {
clear(); clear();
char addr_str[256], port_str[6], drop[2];
char ip_addr_str[100];u32_t port; mylog(log_info, "parsing address: %s\n", str);
mylog(log_info,"parsing address: %s\n",str); if ((sscanf(str, "[%45[^]]]:%5[0-9]%1s", addr_str, port_str, drop) != 2 &&
int is_ipv6=0; sscanf(str, "%255[^:]:%5[0-9]%1s", addr_str, port_str, drop) != 2) ||
if(sscanf(str, "[%[^]]]:%u", ip_addr_str,&port)==2) strtoul(port_str, NULL, 10) > 65535)
{ {
mylog(log_info,"its an ipv6 adress\n"); mylog(log_error, "failed to parse: %s\n", str);
inner.ipv6.sin6_family=AF_INET6;
is_ipv6=1;
}
else if(sscanf(str, "%[^:]:%u", ip_addr_str,&port)==2)
{
mylog(log_info,"its an ipv4 adress\n");
inner.ipv4.sin_family=AF_INET;
}
else
{
mylog(log_error,"failed to parse\n");
myexit(-1); myexit(-1);
} }
mylog(log_info,"ip_address is {%s}, port is {%u}\n",ip_addr_str,port); struct addrinfo *res;
int ret = getaddrinfo(addr_str, port_str, NULL, &res);
if(port>65535) if (ret)
{ {
mylog(log_error,"invalid port: %d\n",port); mylog(log_error, "failed to parse: %s, error code: %d\n", str, ret);
myexit(-1); myexit(-1);
} }
memcpy(&inner, res->ai_addr, res->ai_addrlen);
int ret=-100; freeaddrinfo(res);
if(is_ipv6)
{
ret=inet_pton(AF_INET6, ip_addr_str,&(inner.ipv6.sin6_addr));
inner.ipv6.sin6_port=htons(port);
if(ret==0) // 0 if address type doesnt match
{
mylog(log_error,"ip_addr %s is not an ipv6 address, %d\n",ip_addr_str,ret);
myexit(-1);
}
else if(ret==1) // inet_pton returns 1 on success
{
//okay
}
else
{
mylog(log_error,"ip_addr %s is invalid, %d\n",ip_addr_str,ret);
myexit(-1);
}
}
else
{
ret=inet_pton(AF_INET, ip_addr_str,&(inner.ipv4.sin_addr));
inner.ipv4.sin_port=htons(port);
if(ret==0)
{
mylog(log_error,"ip_addr %s is not an ipv4 address, %d\n",ip_addr_str,ret);
myexit(-1);
}
else if(ret==1)
{
//okay
}
else
{
mylog(log_error,"ip_addr %s is invalid, %d\n",ip_addr_str,ret);
myexit(-1);
}
}
return 0; return 0;
} }
int address_t::from_str_ip_only(char * str) int address_t::from_str_ip_only(char *str)
{ {
clear(); clear();
struct addrinfo hints, *res;
u32_t type; memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_NUMERICHOST;
if(strchr(str,':')==NULL) int ret = getaddrinfo(str, NULL, &hints, &res);
type=AF_INET; if (ret)
else
type=AF_INET6;
((sockaddr*)&inner)->sa_family=type;
int ret;
if(type==AF_INET)
{ {
ret=inet_pton(type, str,&inner.ipv4.sin_addr); mylog(log_error, "invalid addr: %s, error code: %d\n", str, ret);
}
else
{
ret=inet_pton(type, str,&inner.ipv6.sin6_addr);
}
if(ret==0) // 0 if address type doesnt match
{
mylog(log_error,"confusion in parsing %s, %d\n",str,ret);
myexit(-1);
}
else if(ret==1) // inet_pton returns 1 on success
{
//okay
}
else
{
mylog(log_error,"ip_addr %s is invalid, %d\n",str,ret);
myexit(-1); myexit(-1);
} }
memcpy(&inner, res->ai_addr, res->ai_addrlen);
freeaddrinfo(res);
return 0; return 0;
} }

2
common.h
View File

@ -68,6 +68,7 @@ const int is_udp2raw_mp=0;
#if defined(__MINGW32__) #if defined(__MINGW32__)
#include <winsock2.h> #include <winsock2.h>
#include <ws2ipdef.h> #include <ws2ipdef.h>
#include <ws2tcpip.h>
typedef unsigned char u_int8_t; typedef unsigned char u_int8_t;
typedef unsigned short u_int16_t; typedef unsigned short u_int16_t;
typedef unsigned int u_int32_t; typedef unsigned int u_int32_t;
@ -78,6 +79,7 @@ typedef int socklen_t;
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netdb.h>
#endif #endif