From e333f75144f96ef6bbb1215af4ea81d978136899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 15 Feb 2009 17:28:49 +0000 Subject: [PATCH] * Removed left-over debug output. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29218 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/network/ifconfig/ifconfig.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/bin/network/ifconfig/ifconfig.cpp b/src/bin/network/ifconfig/ifconfig.cpp index 021672bf0a..9fc72f47f5 100644 --- a/src/bin/network/ifconfig/ifconfig.cpp +++ b/src/bin/network/ifconfig/ifconfig.cpp @@ -210,7 +210,8 @@ bool prepare_request(struct ifreq& request, const char* name) { 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; } @@ -259,7 +260,8 @@ list_interface(int socket, const char* name) return; 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; } @@ -282,7 +284,8 @@ list_interface(int socket, const char* name) if (ioctl(socket, SIOCGIFPARAM, &request, sizeof(struct ifreq)) == 0) { 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; switch (link.sdl_type) { @@ -715,13 +718,11 @@ configure_interface(int socket, const char* name, char* const* args, // set flags - if (hasAddress || hasMask || hasBroadcast || hasPeer) { + if (hasAddress || hasMask || hasBroadcast || hasPeer) removeFlags = IFF_AUTO_CONFIGURED | IFF_CONFIGURING; - } -printf("set flags: current %x, remove %x, add %x\n", currentFlags, removeFlags, addFlags); + if (addFlags || removeFlags) { request.ifr_flags = (currentFlags & ~removeFlags) | addFlags; -printf(" --> set %x\n", request.ifr_flags); if (ioctl(socket, SIOCSIFFLAGS, &request, sizeof(struct ifreq)) < 0) { fprintf(stderr, "%s: Setting flags failed: %s\n", kProgramName, strerror(errno));