Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Replaced unsafe zero termination of "data" for names utilizing printf format

Browse Source 
trickery.
 * Rewrite resolv.conf once per invokation of _ParseOptions() (as before), while
   solving the problem that OPTION_DOMAIN_NAME_SERVER and OPTION_DOMAIN_NAME may
   appear in arbitrary order.
 * Added TODO about how it should be handled eventually. After the changes in
   r35938, it should now work as before. The only remaining problem is that if
   OPTION_DOMAIN_NAME appears in DHCP_OFFER, but not in DHCP_ACK, the domain
   information is lost.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35940 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2010-03-24 09:36:41 +00:00
parent 24b170b983
commit 538cc4144c
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/servers/net/DHCPClient.cpp
View File

@ -614,6 +614,15 @@ DHCPClient::_ParseOptions(dhcp_message& message, BMessage& address)
message_option option; message_option option;
const uint8* data; const uint8* data;
size_t size; size_t size;
// TODO: We write the resolv.conf file once per _ParseOptions() invokation.
// The invokation happens twice, once for DHCP_OFFER and once for DHCP_ACK.
// If the options in each of these invokations complement each other,
// specifically for OPTION_DOMAIN_NAME_SERVER and OPTION_DOMAIN_NAME, then
// we would lose the information from the previous invokation by
// overwriting the file. A good fix would be to parse resolv.conf, maintain
// all information and distinguish between user entered and auto-generated
// parts of the file.
bool resolvConfCreated = false;
while (message.NextOption(cookie, option, data, size)) { while (message.NextOption(cookie, option, data, size)) {
// iterate through all options // iterate through all options
switch (option) { switch (option) {
@ -628,18 +637,19 @@ DHCPClient::_ParseOptions(dhcp_message& message, BMessage& address)
break; break;
case OPTION_DOMAIN_NAME_SERVER: case OPTION_DOMAIN_NAME_SERVER:
{ {
// TODO: for now, we write it just out to resolv.conf
BPath path; BPath path;
if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) != B_OK) if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) != B_OK
|| path.Append("network/resolv.conf") != B_OK) {
break; break;
}
path.Append("network/resolv.conf"); const char* openMode = resolvConfCreated ? "a" : "w";
FILE* file = fopen(path.Path(), openMode);
FILE* file = fopen(path.Path(), "w");
for (uint32 i = 0; i < size / 4; i++) { for (uint32 i = 0; i < size / 4; i++) {
syslog(LOG_INFO, "DNS: %s\n", syslog(LOG_INFO, "DNS: %s\n",
_ToString(&data[i * 4]).String()); _ToString(&data[i * 4]).String());
if (file != NULL) { if (file != NULL) {
resolvConfCreated = true;
fprintf(file, "nameserver %s\n", fprintf(file, "nameserver %s\n",
_ToString(&data[i * 4]).String()); _ToString(&data[i * 4]).String());
} }
@ -668,30 +678,27 @@ DHCPClient::_ParseOptions(dhcp_message& message, BMessage& address)
break; break;
case OPTION_HOST_NAME: case OPTION_HOST_NAME:
{ syslog(LOG_INFO, "DHCP host name: \"%.*s\"\n",
char name[256]; (int)size, (const char*)data);
memcpy(name, data, size);
name[size] = '\0';
syslog(LOG_INFO, "DHCP host name: \"%s\"\n", name);
break; break;
}
case OPTION_DOMAIN_NAME: case OPTION_DOMAIN_NAME:
{ {
char name[256]; syslog(LOG_INFO, "DHCP domain name: \"%.*s\"\n",
memcpy(name, data, size); (int)size, (const char*)data);
name[size] = '\0';
syslog(LOG_INFO, "DHCP domain name: \"%s\"\n", name);
BPath path; BPath path;
if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) != B_OK) if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) != B_OK
|| path.Append("network/resolv.conf") != B_OK) {
break; break;
}
path.Append("network/resolv.conf");
FILE* file = fopen(path.Path(), "a"); const char* openMode = resolvConfCreated ? "a" : "w";
FILE* file = fopen(path.Path(), openMode);
if (file != NULL) { if (file != NULL) {
fprintf(file, "domain %s\n", name); resolvConfCreated = true;
fprintf(file, "domain %.*s\n", (int)size,
(const char*)data);
fclose(file); fclose(file);
} }
break; break;