diff options
Diffstat (limited to 'src/fbgui/networkmanager.cpp')
-rw-r--r-- | src/fbgui/networkmanager.cpp | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/src/fbgui/networkmanager.cpp b/src/fbgui/networkmanager.cpp index 63e5740..ce2186a 100644 --- a/src/fbgui/networkmanager.cpp +++ b/src/fbgui/networkmanager.cpp @@ -13,7 +13,6 @@ NetworkManager::NetworkManager() { // TODO Auto-generated constructor stub - _tag = "[nd:NetworkManager]"; } NetworkManager::~NetworkManager() @@ -60,11 +59,11 @@ NetworkManager::replaceDefaultRoute(QString ifname, QString gateway, int mss, QByteArray ba_gw = gateway.toAscii(); char * gwaddr = ba_gw.data(); - qDebug() << _tag << "---doRoute() gwaddr" << gwaddr; + qDebug() << "---doRoute() gwaddr" << gwaddr; if (!(gw = nl_addr_parse(gwaddr, af))) { - qDebug() << _tag << "Invalid router address given:" << gwaddr; + qDebug() << "Invalid router address given:" << gwaddr; return -1; } @@ -73,7 +72,7 @@ NetworkManager::replaceDefaultRoute(QString ifname, QString gateway, int mss, if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL) { - qDebug() << _tag << "error with link cache alloc \n"; + qDebug() << "error with link cache alloc \n"; } iface_idx = rtnl_link_name2i(cache, ifn); @@ -89,7 +88,7 @@ NetworkManager::replaceDefaultRoute(QString ifname, QString gateway, int mss, } retval = rtnl_route_add(rtsock, route, NLM_F_REPLACE); - qDebug() << _tag << "return value:" << retval << ":" << strerror(-retval); + qDebug() << "return value:" << retval << ":" << strerror(-retval); rtnl_route_put(route); nl_addr_put(gw); @@ -115,7 +114,7 @@ NetworkManager::ip6_addRoute(const char *iface, const struct in6_addr *ip6_dest, if ((cache = rtnl_link_alloc_cache(nlh)) == NULL) { - //qDebug() << _tag << "error with link cache alloc \n"; + //qDebug() << "error with link cache alloc \n"; printf("error with link cache alloc \n"); } @@ -269,7 +268,7 @@ NetworkManager::bringInterfaceUpDown(QString ifname, bool up) if (!(request = rtnl_link_alloc())) { - qDebug() << _tag << "error. couldn't allocate a rtnl link"; + qDebug() << "error. couldn't allocate a rtnl link"; return -1; } @@ -287,20 +286,20 @@ NetworkManager::bringInterfaceUpDown(QString ifname, bool up) if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL) { - qDebug() << _tag << "error with link cache alloc "; + qDebug() << "error with link cache alloc "; } old = rtnl_link_get_by_name(cache, ifn); if (old) { - qDebug() << _tag << "change link"; + qDebug() << "change link"; retval = rtnl_link_change(rtsock, old, request, 0); } else { - qDebug() << _tag << "change failed"; + qDebug() << "change failed"; retval = -1; - qDebug() << _tag << "return value:" << retval << ":" << strerror(-retval); + qDebug() << "return value:" << retval << ":" << strerror(-retval); } rtnl_link_put(old); @@ -384,7 +383,7 @@ NetworkManager::ip4_configureInterface(QString ifname, QString ipAddress, if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL) { - qDebug() << _tag << "error with link cache alloc"; + qDebug() << "error with link cache alloc"; return -1; } @@ -392,7 +391,7 @@ NetworkManager::ip4_configureInterface(QString ifname, QString ipAddress, if (!(addr = rtnl_addr_alloc())) { - qDebug() << _tag << "error with addr alloc"; + qDebug() << "error with addr alloc"; return -1; } @@ -401,11 +400,11 @@ NetworkManager::ip4_configureInterface(QString ifname, QString ipAddress, nl_addr_put(local); if (err != 0) { - qDebug() << _tag << "error with set local addr"; + qDebug() << "error with set local addr"; } prefixLength = ip4_netmaskToPrefix(ipAddress, netmask); - qDebug() << _tag << "prefix length:" << prefixLength; + qDebug() << "prefix length:" << prefixLength; rtnl_addr_set_prefixlen(addr, prefixLength); local = nl_addr_parse(bcaddr, af); @@ -413,7 +412,7 @@ NetworkManager::ip4_configureInterface(QString ifname, QString ipAddress, nl_addr_put(local); if (err != 0) { - qDebug() << _tag << "error with set broadcast addr"; + qDebug() << "error with set broadcast addr"; } rtnl_addr_set_ifindex(addr, iface_idx); @@ -421,7 +420,7 @@ NetworkManager::ip4_configureInterface(QString ifname, QString ipAddress, retval = sync_address(ifn, iface_idx, af, addr); if (retval < 0) { - qDebug() << _tag << "error in sync_address"; + qDebug() << "error in sync_address"; } rtnl_addr_put(addr); @@ -447,7 +446,7 @@ NetworkManager::ip4_netmaskToPrefix(QString ipAddr, QString netmask) if (netmask == "") { - qDebug() << _tag << "error: netmask is empty"; + qDebug() << "error: netmask is empty"; return retval; } nae.setIp(QHostAddress(ipAddr)); @@ -470,7 +469,7 @@ NetworkManager::ip6_addAddress(struct ip6_addr* ip6Addr, const char *iface) if ((cache = rtnl_link_alloc_cache(rtsock)) == NULL) { - qDebug() << _tag << "error with link cache alloc"; + qDebug() << "error with link cache alloc"; return -1; } @@ -639,7 +638,7 @@ nlh = nl_handle_alloc(); { //nm_log_err (log_domain, "(%s): error %d returned from rtnl_addr_delete(): %s", // iface, err, nl_geterror ()); - qDebug() << _tag << "error with delete addr"; + qDebug() << "error with delete addr"; } } @@ -672,7 +671,7 @@ if (buf_valid == 0) { //nm_log_dbg (log_domain, "(%s): adding address '%s/%d'", //iface, buf, nl_addr_get_prefixlen (nladdr)); - qDebug() << _tag << "buf valid adding addr"; + qDebug() << "buf valid adding addr"; } err = rtnl_addr_add(nlh, addr, 0); @@ -681,7 +680,7 @@ if (err < 0) //nm_log_err (log_domain, // "(%s): error %d returned from rtnl_addr_add():\n%s", // iface, err, nl_geterror ()); - qDebug() << _tag << "error with add addr" << strerror(-err); + qDebug() << "error with add addr" << strerror(-err); } rtnl_addr_put(addr); @@ -711,7 +710,7 @@ NetworkManager::writeResolvConf(QString path, QString ifname, QFile file(path + "resolv.conf"); if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) { - qDebug() << _tag << "error couldn't open file:" << path; + qDebug() << "error couldn't open file:" << path; return -1; } QTextStream out(&file); |