i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rearranged ipv4_control() a bit, and fixed a bug that would always return B_BAD_VALUE

Browse Source 
on setsockopt() for all options. Thanks to Hugo Santos for pointing this out.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@20421 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2007-03-25 12:59:39 +00:00
parent 19b0fb934c
commit 6de46a8005
1 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/network/protocols/ipv4/ipv4.cpp
+48 -47
View File
@@ -821,55 +821,56 @@ ipv4_control(net_protocol *_protocol, int level, int option, void *value,
dprintf("IPv4::control(): get unknown option: %d\n", option); dprintf("IPv4::control(): get unknown option: %d\n", option);
return ENOPROTOOPT; return ENOPROTOOPT;
} }
} else {
// set options
switch (option) {
case IP_HDRINCL:
{
int headerIncluded;
if (*_length != sizeof(int))
return B_BAD_VALUE;
if (user_memcpy(&headerIncluded, value, sizeof(headerIncluded)) < B_OK)
return B_BAD_ADDRESS;
if (headerIncluded)
protocol->flags |= IP_FLAG_HEADER_INCLUDED;
else
protocol->flags &= ~IP_FLAG_HEADER_INCLUDED;
break;
}
case IP_TTL:
{
int timeToLive;
if (*_length != sizeof(int))
return B_BAD_VALUE;
if (user_memcpy(&timeToLive, value, sizeof(timeToLive)) < B_OK)
return B_BAD_ADDRESS;
protocol->time_to_live = timeToLive;
break;
}
case IP_TOS:
{
int serviceType;
if (*_length != sizeof(int))
return B_BAD_VALUE;
if (user_memcpy(&serviceType, value, sizeof(serviceType)) < B_OK)
return B_BAD_ADDRESS;
protocol->service_type = serviceType;
break;
}
default:
dprintf("IPv4::control(): set unknown option: %d\n", option);
return ENOPROTOOPT;
}
} }
// set options
switch (option) {
case IP_HDRINCL:
{
int headerIncluded;
if (*_length != sizeof(int))
return B_BAD_VALUE;
if (user_memcpy(&headerIncluded, value, sizeof(headerIncluded)) < B_OK)
return B_BAD_ADDRESS;
if (headerIncluded)
protocol->flags |= IP_FLAG_HEADER_INCLUDED;
else
protocol->flags &= ~IP_FLAG_HEADER_INCLUDED;
return B_OK;
}
case IP_TTL:
{
int timeToLive;
if (*_length != sizeof(int))
return B_BAD_VALUE;
if (user_memcpy(&timeToLive, value, sizeof(timeToLive)) < B_OK)
return B_BAD_ADDRESS;
protocol->time_to_live = timeToLive;
return B_OK;
}
case IP_TOS:
{
int serviceType;
if (*_length != sizeof(int))
return B_BAD_VALUE;
if (user_memcpy(&serviceType, value, sizeof(serviceType)) < B_OK)
return B_BAD_ADDRESS;
protocol->service_type = serviceType;
return B_OK;
}
default:
dprintf("IPv4::control(): set unknown option: %d\n", option);
return ENOPROTOOPT;
}
// never gets here
return B_BAD_VALUE; return B_BAD_VALUE;
} }