external/uhub
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Always provide IP address to all clients.

Browse Source 
Signed-off-by: Jan Vidar Krey <janvidar@extatic.org>
This commit is contained in:
Jan Vidar Krey 2009-03-12 16:24:44 +01:00
parent 18b0dc713f
commit a3520fbf09
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/inf.c
View File

@ -193,30 +193,21 @@ int check_network(struct user* user, struct adc_message* cmd)
int nat_override = 0; int nat_override = 0;
const char* address = 0; const char* address = 0;
if (adc_msg_has_named_argument(cmd, ADC_INF_FLAG_IPV6_ADDR))
{
want_ipv6 = 1;
}
if (adc_msg_has_named_argument(cmd, ADC_INF_FLAG_IPV4_ADDR))
{
want_ipv4 = 1;
}
if (!want_ipv4 && !want_ipv6)
return 0;
/* Add correct/verified IP addresses instead (if requested/stripped) */ /* Add correct/verified IP addresses instead (if requested/stripped) */
address = (char*) net_get_peer_address(user->sd); address = (char*) net_get_peer_address(user->sd);
if (address) if (address)
{ {
if (want_ipv4 && strchr(address, '.')) if (strchr(address, '.'))
{ {
want_ipv6 = 0; adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV6_ADDR);
adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV6_UDP_PORT);
want_ipv4 = 1;
} }
else if (want_ipv6) else if (strchr(address, ':'))
{ {
want_ipv4 = 0; adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV4_ADDR);
adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV4_UDP_PORT);
want_ipv6 = 1;
} }
/* check if user can do nat override */ /* check if user can do nat override */
@ -234,16 +225,10 @@ int check_network(struct user* user, struct adc_message* cmd)
if (!nat_override) if (!nat_override)
{ {
adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV4_ADDR); if (want_ipv4)
if (!want_ipv4)
adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV4_UDP_PORT);
else
adc_msg_add_named_argument(cmd, ADC_INF_FLAG_IPV4_ADDR, address); adc_msg_add_named_argument(cmd, ADC_INF_FLAG_IPV4_ADDR, address);
adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV6_ADDR); if (want_ipv6)
if (!want_ipv6)
adc_msg_remove_named_argument(cmd, ADC_INF_FLAG_IPV6_UDP_PORT);
else
adc_msg_add_named_argument(cmd, ADC_INF_FLAG_IPV6_ADDR, address); adc_msg_add_named_argument(cmd, ADC_INF_FLAG_IPV6_ADDR, address);
} }