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

* Removed left-over debug output.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29218 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-02-15 17:28:49 +00:00
parent 4b08e1b9e3
commit e333f75144
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/bin/network/ifconfig/ifconfig.cpp
View File

@ -210,7 +210,8 @@ bool
prepare_request(struct ifreq& request, const char* name) prepare_request(struct ifreq& request, const char* name)
{ {
if (strlen(name) > IF_NAMESIZE) { if (strlen(name) > IF_NAMESIZE) {
fprintf(stderr, "%s: interface name \"%s\" is too long.\n", kProgramName, name); fprintf(stderr, "%s: interface name \"%s\" is too long.\n", kProgramName,
name);
return false; return false;
} }
@ -259,7 +260,8 @@ list_interface(int socket, const char* name)
return; return;
if (ioctl(socket, SIOCGIFINDEX, &request, sizeof(request)) < 0) { if (ioctl(socket, SIOCGIFINDEX, &request, sizeof(request)) < 0) {
fprintf(stderr, "%s: Interface \"%s\" does not exist.\n", kProgramName, name); fprintf(stderr, "%s: Interface \"%s\" does not exist.\n", kProgramName,
name);
return; return;
} }
@ -282,7 +284,8 @@ list_interface(int socket, const char* name)
if (ioctl(socket, SIOCGIFPARAM, &request, sizeof(struct ifreq)) == 0) { if (ioctl(socket, SIOCGIFPARAM, &request, sizeof(struct ifreq)) == 0) {
prepare_request(request, request.ifr_parameter.device); prepare_request(request, request.ifr_parameter.device);
if (ioctl(linkSocket, SIOCGIFADDR, &request, sizeof(struct ifreq)) == 0) { if (ioctl(linkSocket, SIOCGIFADDR, &request, sizeof(struct ifreq))
== 0) {
sockaddr_dl &link = *(sockaddr_dl *)&request.ifr_addr; sockaddr_dl &link = *(sockaddr_dl *)&request.ifr_addr;
switch (link.sdl_type) { switch (link.sdl_type) {
@ -715,13 +718,11 @@ configure_interface(int socket, const char* name, char* const* args,
// set flags // set flags
if (hasAddress || hasMask || hasBroadcast || hasPeer) { if (hasAddress || hasMask || hasBroadcast || hasPeer)
removeFlags = IFF_AUTO_CONFIGURED | IFF_CONFIGURING; removeFlags = IFF_AUTO_CONFIGURED | IFF_CONFIGURING;
}
printf("set flags: current %x, remove %x, add %x\n", currentFlags, removeFlags, addFlags);
if (addFlags || removeFlags) { if (addFlags || removeFlags) {
request.ifr_flags = (currentFlags & ~removeFlags) | addFlags; request.ifr_flags = (currentFlags & ~removeFlags) | addFlags;
printf(" --> set %x\n", request.ifr_flags);
if (ioctl(socket, SIOCSIFFLAGS, &request, sizeof(struct ifreq)) < 0) { if (ioctl(socket, SIOCSIFFLAGS, &request, sizeof(struct ifreq)) < 0) {
fprintf(stderr, "%s: Setting flags failed: %s\n", kProgramName, fprintf(stderr, "%s: Setting flags failed: %s\n", kProgramName,
strerror(errno)); strerror(errno));