colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2005-06-19 Dan Williams <dcbw@redhat.com>

Browse Source 
* WEXT_DEBUG->IOCTL_DEBUG, extend checking to all ioctl() calls


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@720 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-06-19 19:07:47 +00:00
parent 984d79a076
commit e5638d0eaa
4 changed files with 208 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2005-06-19 Dan Williams <dcbw@redhat.com>
* WEXT_DEBUG->IOCTL_DEBUG, extend checking to all ioctl() calls
2005-06-18 Ray Strode <rstrode@redhat.com> 2005-06-18 Ray Strode <rstrode@redhat.com>
* src/nm-netlink-monitor.c * src/nm-netlink-monitor.c

86
src/NetworkManagerDevice.c
View File

@@ -100,7 +100,13 @@ static gboolean nm_device_test_wireless_extensions (NMDevice *dev)
if ((sk = nm_dev_sock_open (dev, DEV_WIRELESS, __FUNCTION__, NULL))) if ((sk = nm_dev_sock_open (dev, DEV_WIRELESS, __FUNCTION__, NULL)))
{ {
#ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IWNAME\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCGIWNAME, ioctl_buf); err = ioctl (nm_dev_sock_get_fd (sk), SIOCGIWNAME, ioctl_buf);
#ifdef IOCTL_DEBUG
nm_info ("%s: Done with GET IWNAME\n", nm_device_get_iface (dev));
#endif
nm_dev_sock_close (sk); nm_dev_sock_close (sk);
} }
return (err == 0); return (err == 0);
@@ -767,7 +773,7 @@ static gboolean nm_device_wireless_is_associated (NMDevice *dev)
* address check using this check on IWNAME. Its faster. * address check using this check on IWNAME. Its faster.
*/ */
memset (&wrq, 0, sizeof (struct iwreq)); memset (&wrq, 0, sizeof (struct iwreq));
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IWNAME.", nm_device_get_iface (dev)); nm_info ("%s: About to GET IWNAME.", nm_device_get_iface (dev));
#endif #endif
if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWNAME, &wrq) >= 0) if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWNAME, &wrq) >= 0)
@@ -787,7 +793,7 @@ static gboolean nm_device_wireless_is_associated (NMDevice *dev)
* Is there a better way? Some cards don't work too well with this check, ie * Is there a better way? Some cards don't work too well with this check, ie
* Lucent WaveLAN. * Lucent WaveLAN.
*/ */
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IWAP.", nm_device_get_iface (dev)); nm_info ("%s: About to GET IWAP.", nm_device_get_iface (dev));
#endif #endif
if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWAP, &wrq) >= 0) if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWAP, &wrq) >= 0)
@@ -937,7 +943,7 @@ char * nm_device_get_essid (NMDevice *dev)
{ {
wireless_config info; wireless_config info;
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET 'basic config' for ESSID.", nm_device_get_iface (dev)); nm_info ("%s: About to GET 'basic config' for ESSID.", nm_device_get_iface (dev));
#endif #endif
err = iw_get_basic_config (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), &info); err = iw_get_basic_config (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), &info);
@@ -996,7 +1002,7 @@ void nm_device_set_essid (NMDevice *dev, const char *essid)
wreq.u.essid.length = strlen (safe_essid) + 1; wreq.u.essid.length = strlen (safe_essid) + 1;
wreq.u.essid.flags = 1; /* Enable essid on card */ wreq.u.essid.flags = 1; /* Enable essid on card */
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IWESSID.", nm_device_get_iface (dev)); nm_info ("%s: About to SET IWESSID.", nm_device_get_iface (dev));
#endif #endif
if ((err = iw_set_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCSIWESSID, &wreq)) == -1) if ((err = iw_set_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCSIWESSID, &wreq)) == -1)
@@ -1040,7 +1046,7 @@ double nm_device_get_frequency (NMDevice *dev)
{ {
struct iwreq wrq; struct iwreq wrq;
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IWFREQ.", nm_device_get_iface (dev)); nm_info ("%s: About to GET IWFREQ.", nm_device_get_iface (dev));
#endif #endif
err = iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWFREQ, &wrq); err = iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWFREQ, &wrq);
@@ -1111,7 +1117,7 @@ void nm_device_set_frequency (NMDevice *dev, const double freq)
wrq.u.freq.flags = IW_FREQ_FIXED; wrq.u.freq.flags = IW_FREQ_FIXED;
iw_float2freq (freq, &wrq.u.freq); iw_float2freq (freq, &wrq.u.freq);
} }
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IWFREQ.", nm_device_get_iface (dev)); nm_info ("%s: About to SET IWFREQ.", nm_device_get_iface (dev));
#endif #endif
if ((err = iw_set_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCSIWFREQ, &wrq)) == -1) if ((err = iw_set_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCSIWFREQ, &wrq)) == -1)
@@ -1155,7 +1161,7 @@ int nm_device_get_bitrate (NMDevice *dev)
if ((sk = nm_dev_sock_open (dev, DEV_WIRELESS, __FUNCTION__, NULL))) if ((sk = nm_dev_sock_open (dev, DEV_WIRELESS, __FUNCTION__, NULL)))
{ {
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IWRATE.", nm_device_get_iface (dev)); nm_info ("%s: About to GET IWRATE.", nm_device_get_iface (dev));
#endif #endif
err = iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWRATE, &wrq); err = iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWRATE, &wrq);
@@ -1203,7 +1209,7 @@ void nm_device_set_bitrate (NMDevice *dev, const int Mbps)
wrq.u.bitrate.fixed = 0; wrq.u.bitrate.fixed = 0;
} }
/* Silently fail as not all drivers support setting bitrate yet (ipw2x00 for example) */ /* Silently fail as not all drivers support setting bitrate yet (ipw2x00 for example) */
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IWRATE.", nm_device_get_iface (dev)); nm_info ("%s: About to SET IWRATE.", nm_device_get_iface (dev));
#endif #endif
iw_set_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCSIWRATE, &wrq); iw_set_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCSIWRATE, &wrq);
@@ -1245,7 +1251,7 @@ void nm_device_get_ap_address (NMDevice *dev, struct ether_addr *addr)
if ((sk = nm_dev_sock_open (dev, DEV_WIRELESS, __FUNCTION__, NULL))) if ((sk = nm_dev_sock_open (dev, DEV_WIRELESS, __FUNCTION__, NULL)))
{ {
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IWAP.", nm_device_get_iface (dev)); nm_info ("%s: About to GET IWAP.", nm_device_get_iface (dev));
#endif #endif
if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWAP, &wrq) >= 0) if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWAP, &wrq) >= 0)
@@ -1333,7 +1339,7 @@ void nm_device_set_enc_key (NMDevice *dev, const char *key, NMDeviceAuthMethod a
if (set_key) if (set_key)
{ {
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IWENCODE.", nm_device_get_iface (dev)); nm_info ("%s: About to SET IWENCODE.", nm_device_get_iface (dev));
#endif #endif
if (iw_set_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCSIWENCODE, &wreq) == -1) if (iw_set_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCSIWENCODE, &wreq) == -1)
@@ -1411,11 +1417,11 @@ void nm_device_update_signal_strength (NMDevice *dev)
{ {
memset (&range, 0, sizeof (iwrange)); memset (&range, 0, sizeof (iwrange));
memset (&stats, 0, sizeof (iwstats)); memset (&stats, 0, sizeof (iwstats));
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET 'iwrange'.", nm_device_get_iface (dev)); nm_info ("%s: About to GET 'iwrange'.", nm_device_get_iface (dev));
#endif #endif
has_range = (iw_get_range_info (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), &range) >= 0); has_range = (iw_get_range_info (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), &range) >= 0);
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET 'iwstats'.", nm_device_get_iface (dev)); nm_info ("%s: About to GET 'iwstats'.", nm_device_get_iface (dev));
#endif #endif
if (iw_get_stats (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), &stats, &range, has_range) == 0) if (iw_get_stats (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), &stats, &range, has_range) == 0)
@@ -1477,10 +1483,13 @@ void nm_device_update_ip4_address (NMDevice *dev)
memset (&req, 0, sizeof (struct ifreq)); memset (&req, 0, sizeof (struct ifreq));
strncpy ((char *)(&req.ifr_name), nm_device_get_iface (dev), strlen (nm_device_get_iface (dev))); strncpy ((char *)(&req.ifr_name), nm_device_get_iface (dev), strlen (nm_device_get_iface (dev)));
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IFADDR.", nm_device_get_iface (dev)); nm_info ("%s: About to GET IFADDR.", nm_device_get_iface (dev));
#endif #endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCGIFADDR, &req); err = ioctl (nm_dev_sock_get_fd (sk), SIOCGIFADDR, &req);
#ifdef IOCTL_DEBUG
nm_info ("%s: Done with GET IFADDR.", nm_device_get_iface (dev));
#endif
nm_dev_sock_close (sk); nm_dev_sock_close (sk);
if (err != 0) if (err != 0)
return; return;
@@ -1541,10 +1550,13 @@ void nm_device_update_hw_address (NMDevice *dev)
memset (&req, 0, sizeof (struct ifreq)); memset (&req, 0, sizeof (struct ifreq));
strncpy ((char *)(&req.ifr_name), nm_device_get_iface (dev), strlen (nm_device_get_iface (dev))); strncpy ((char *)(&req.ifr_name), nm_device_get_iface (dev), strlen (nm_device_get_iface (dev)));
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IFHWADDR.", nm_device_get_iface (dev)); nm_info ("%s: About to GET IFHWADDR.", nm_device_get_iface (dev));
#endif #endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCGIFHWADDR, &req); err = ioctl (nm_dev_sock_get_fd (sk), SIOCGIFHWADDR, &req);
#ifdef IOCTL_DEBUG
nm_info ("%s: Done with GET IFHWADDR.", nm_device_get_iface (dev));
#endif
nm_dev_sock_close (sk); nm_dev_sock_close (sk);
if (err != 0) if (err != 0)
return; return;
@@ -1600,10 +1612,13 @@ gboolean nm_device_is_up (NMDevice *dev)
/* Get device's flags */ /* Get device's flags */
strcpy (ifr.ifr_name, nm_device_get_iface (dev)); strcpy (ifr.ifr_name, nm_device_get_iface (dev));
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IFFLAGS.", nm_device_get_iface (dev)); nm_info ("%s: About to GET IFFLAGS.", nm_device_get_iface (dev));
#endif #endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCGIFFLAGS, &ifr); err = ioctl (nm_dev_sock_get_fd (sk), SIOCGIFFLAGS, &ifr);
#ifdef IOCTL_DEBUG
nm_info ("%s: Done with GET IFFLAGS.", nm_device_get_iface (dev));
#endif
nm_dev_sock_close (sk); nm_dev_sock_close (sk);
if (!err) if (!err)
return (!((ifr.ifr_flags^IFF_UP) & IFF_UP)); return (!((ifr.ifr_flags^IFF_UP) & IFF_UP));
@@ -1728,7 +1743,7 @@ NMNetworkMode nm_device_get_mode (NMDevice *dev)
int err; int err;
memset (&wrq, 0, sizeof (struct iwreq)); memset (&wrq, 0, sizeof (struct iwreq));
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IWMODE.", nm_device_get_iface (dev)); nm_info ("%s: About to GET IWMODE.", nm_device_get_iface (dev));
#endif #endif
if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWMODE, &wrq) == 0) if (iw_get_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCGIWMODE, &wrq) == 0)
@@ -1795,7 +1810,7 @@ gboolean nm_device_set_mode (NMDevice *dev, const NMNetworkMode mode)
} }
if (mode_good) if (mode_good)
{ {
#ifdef WEXT_DEBUG #ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IWMODE.", nm_device_get_iface (dev)); nm_info ("%s: About to SET IWMODE.", nm_device_get_iface (dev));
#endif #endif
if (iw_set_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCSIWMODE, &wreq) == 0) if (iw_set_ext (nm_dev_sock_get_fd (sk), nm_device_get_iface (dev), SIOCSIWMODE, &wreq) == 0)
@@ -4150,12 +4165,18 @@ static gboolean supports_ethtool_carrier_detect (NMDevice *dev)
strncpy (ifr.ifr_name, nm_device_get_iface (dev), sizeof(ifr.ifr_name)-1); strncpy (ifr.ifr_name, nm_device_get_iface (dev), sizeof(ifr.ifr_name)-1);
edata.cmd = ETHTOOL_GLINK; edata.cmd = ETHTOOL_GLINK;
ifr.ifr_data = (char *) &edata; ifr.ifr_data = (char *) &edata;
#ifdef IOCTL_DEBUG
nm_info ("%s: About to ETHTOOL\n", nm_device_get_iface (dev));
#endif
if (ioctl (nm_dev_sock_get_fd (sk), SIOCETHTOOL, &ifr) == -1) if (ioctl (nm_dev_sock_get_fd (sk), SIOCETHTOOL, &ifr) == -1)
goto out; goto out;
supports_ethtool = TRUE; supports_ethtool = TRUE;
out: out:
#ifdef IOCTL_DEBUG
nm_info ("%s: Done with ETHTOOL\n", nm_device_get_iface (dev));
#endif
nm_dev_sock_close (sk); nm_dev_sock_close (sk);
return (supports_ethtool); return (supports_ethtool);
} }
@@ -4167,9 +4188,10 @@ out:
/**************************************/ /**************************************/
#include <linux/mii.h> #include <linux/mii.h>
static int mdio_read (NMSock *sk, struct ifreq *ifr, int location) static int mdio_read (NMDevice *dev, NMSock *sk, struct ifreq *ifr, int location)
{ {
struct mii_ioctl_data *mii; struct mii_ioctl_data *mii;
int val = -1;
g_return_val_if_fail (sk != NULL, -1); g_return_val_if_fail (sk != NULL, -1);
g_return_val_if_fail (ifr != NULL, -1); g_return_val_if_fail (ifr != NULL, -1);
@@ -4177,18 +4199,25 @@ static int mdio_read (NMSock *sk, struct ifreq *ifr, int location)
mii = (struct mii_ioctl_data *) &(ifr->ifr_data); mii = (struct mii_ioctl_data *) &(ifr->ifr_data);
mii->reg_num = location; mii->reg_num = location;
if (ioctl (nm_dev_sock_get_fd (sk), SIOCGMIIREG, ifr) < 0) #ifdef IOCTL_DEBUG
return -1; nm_info ("%s: About to GET MIIREG\n", nm_device_get_iface (dev));
#endif
if (ioctl (nm_dev_sock_get_fd (sk), SIOCGMIIREG, ifr) >= 0)
val = mii->val_out;
#ifdef IOCTL_DEBUG
nm_info ("%s: Done with GET MIIREG\n", nm_device_get_iface (dev));
#endif
return (mii->val_out); return val;
} }
static gboolean supports_mii_carrier_detect (NMDevice *dev) static gboolean supports_mii_carrier_detect (NMDevice *dev)
{ {
NMSock *sk; NMSock * sk;
struct ifreq ifr; struct ifreq ifr;
int bmsr; int bmsr;
gboolean supports_mii = FALSE; gboolean supports_mii = FALSE;
int err;
g_return_val_if_fail (dev != NULL, FALSE); g_return_val_if_fail (dev != NULL, FALSE);
@@ -4199,16 +4228,23 @@ static gboolean supports_mii_carrier_detect (NMDevice *dev)
} }
strncpy (ifr.ifr_name, nm_device_get_iface (dev), sizeof(ifr.ifr_name)-1); strncpy (ifr.ifr_name, nm_device_get_iface (dev), sizeof(ifr.ifr_name)-1);
if (ioctl (nm_dev_sock_get_fd (sk), SIOCGMIIPHY, &ifr) < 0) #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET MIIPHY\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCGMIIPHY, &ifr);
#ifdef IOCTL_DEBUG
nm_info ("%s: Done with GET MIIPHY\n", nm_device_get_iface (dev));
#endif
if (err < 0)
goto out; goto out;
/* If we can read the BMSR register, we assume that the card supports MII link detection */ /* If we can read the BMSR register, we assume that the card supports MII link detection */
bmsr = mdio_read (sk, &ifr, MII_BMSR); bmsr = mdio_read (dev, sk, &ifr, MII_BMSR);
supports_mii = (bmsr != -1) ? TRUE : FALSE; supports_mii = (bmsr != -1) ? TRUE : FALSE;
out: out:
nm_dev_sock_close (sk); nm_dev_sock_close (sk);
return (supports_mii); return supports_mii;
} }
/****************************************/ /****************************************/

1
src/NetworkManagerDevice.h
View File

@@ -28,6 +28,7 @@
#include "NetworkManagerMain.h" #include "NetworkManagerMain.h"
#include "nm-ip4-config.h" #include "nm-ip4-config.h"
/* #define IOCTL_DEBUG /* */
typedef struct NMDevice NMDevice; typedef struct NMDevice NMDevice;

149
src/NetworkManagerSystem.c
View File

@@ -373,6 +373,7 @@ gboolean nm_system_device_set_up_down_with_iface (NMDevice *dev, const char *ifa
guint32 flags = up ? IFF_UP : ~IFF_UP; guint32 flags = up ? IFF_UP : ~IFF_UP;
NMSock * sk; NMSock * sk;
gboolean success = FALSE; gboolean success = FALSE;
int err;
g_return_val_if_fail (iface != NULL, FALSE); g_return_val_if_fail (iface != NULL, FALSE);
@@ -382,7 +383,15 @@ gboolean nm_system_device_set_up_down_with_iface (NMDevice *dev, const char *ifa
/* Get flags already there */ /* Get flags already there */
memset (&ifr, 0, sizeof (struct ifreq)); memset (&ifr, 0, sizeof (struct ifreq));
memcpy (ifr.ifr_name, iface, strlen (iface)); memcpy (ifr.ifr_name, iface, strlen (iface));
if (ioctl (nm_dev_sock_get_fd (sk), SIOCGIFFLAGS, &ifr) == -1) #ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IFFLAGS\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCGIFFLAGS, &ifr);
#ifdef IOCTL_DEBUG
nm_info ("%s: Done with GET IFFLAGS\n", nm_device_get_iface (dev));
#endif
if (err == -1)
{ {
if (errno != ENODEV) if (errno != ENODEV)
nm_warning ("nm_system_device_set_up_down_with_iface() could not get flags for device %s. errno = %d", iface, errno ); nm_warning ("nm_system_device_set_up_down_with_iface() could not get flags for device %s. errno = %d", iface, errno );
@@ -394,7 +403,16 @@ gboolean nm_system_device_set_up_down_with_iface (NMDevice *dev, const char *ifa
{ {
ifr.ifr_flags &= ~IFF_UP; ifr.ifr_flags &= ~IFF_UP;
ifr.ifr_flags |= IFF_UP & flags; ifr.ifr_flags |= IFF_UP & flags;
if (ioctl (nm_dev_sock_get_fd (sk), SIOCSIFFLAGS, &ifr) == -1)
#ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFFLAGS\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCSIFFLAGS, &ifr);
#ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFFLAGS\n", nm_device_get_iface (dev));
#endif
if (err == -1)
{ {
if (errno != ENODEV) if (errno != ENODEV)
nm_warning ("nm_system_device_set_up_down_with_iface() could not bring device %s %s. errno = %d", iface, (up ? "up" : "down"), errno); nm_warning ("nm_system_device_set_up_down_with_iface() could not bring device %s %s. errno = %d", iface, (up ? "up" : "down"), errno);
@@ -423,9 +441,10 @@ static gboolean nm_system_device_set_ip4_address (NMDevice *dev, int ip4_address
static gboolean nm_system_device_set_ip4_address_with_iface (NMDevice *dev, const char *iface, int ip4_address) static gboolean nm_system_device_set_ip4_address_with_iface (NMDevice *dev, const char *iface, int ip4_address)
{ {
struct ifreq ifr; struct ifreq ifr;
NMSock *sk; NMSock * sk;
gboolean success = FALSE; gboolean success = FALSE;
struct sockaddr_in *p = (struct sockaddr_in *)&(ifr.ifr_addr); struct sockaddr_in *p = (struct sockaddr_in *)&(ifr.ifr_addr);
int err;
g_return_val_if_fail (iface != NULL, FALSE); g_return_val_if_fail (iface != NULL, FALSE);
@@ -436,7 +455,16 @@ static gboolean nm_system_device_set_ip4_address_with_iface (NMDevice *dev, cons
memcpy (ifr.ifr_name, iface, strlen (iface)); memcpy (ifr.ifr_name, iface, strlen (iface));
p->sin_family = AF_INET; p->sin_family = AF_INET;
p->sin_addr.s_addr = ip4_address; p->sin_addr.s_addr = ip4_address;
if (ioctl (nm_dev_sock_get_fd (sk), SIOCSIFADDR, &ifr) == -1)
#ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFADDR\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCSIFADDR, &ifr);
#ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFADDR\n", nm_device_get_iface (dev));
#endif
if (err == -1)
nm_warning ("nm_system_device_set_ip4_address_by_iface (%s): failed to set IPv4 address!", iface); nm_warning ("nm_system_device_set_ip4_address_by_iface (%s): failed to set IPv4 address!", iface);
else else
{ {
@@ -447,7 +475,7 @@ static gboolean nm_system_device_set_ip4_address_with_iface (NMDevice *dev, cons
} }
nm_dev_sock_close (sk); nm_dev_sock_close (sk);
return (success); return success;
} }
@@ -467,9 +495,10 @@ static gboolean nm_system_device_set_ip4_ptp_address (NMDevice *dev, int ip4_ptp
static gboolean nm_system_device_set_ip4_ptp_address_with_iface (NMDevice *dev, const char *iface, int ip4_ptp_address) static gboolean nm_system_device_set_ip4_ptp_address_with_iface (NMDevice *dev, const char *iface, int ip4_ptp_address)
{ {
struct ifreq ifr; struct ifreq ifr;
NMSock *sk; NMSock * sk;
gboolean success = FALSE; gboolean success = FALSE;
struct sockaddr_in *p = (struct sockaddr_in *)&(ifr.ifr_addr); struct sockaddr_in *p = (struct sockaddr_in *)&(ifr.ifr_addr);
int err;
g_return_val_if_fail (iface != NULL, FALSE); g_return_val_if_fail (iface != NULL, FALSE);
@@ -482,7 +511,15 @@ static gboolean nm_system_device_set_ip4_ptp_address_with_iface (NMDevice *dev,
p->sin_port = 0; p->sin_port = 0;
p->sin_addr.s_addr = ip4_ptp_address; p->sin_addr.s_addr = ip4_ptp_address;
if (ioctl (nm_dev_sock_get_fd (sk), SIOCSIFDSTADDR, &ifr) == -1) #ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFDSTADDR\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCSIFDSTADDR, &ifr);
#ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFDSTADDR\n", nm_device_get_iface (dev));
#endif
if (err == -1)
nm_warning ("nm_system_device_set_ip4_ptp_address (%s): failed to set IPv4 point-to-point address!", iface); nm_warning ("nm_system_device_set_ip4_ptp_address (%s): failed to set IPv4 point-to-point address!", iface);
else else
{ {
@@ -490,11 +527,29 @@ static gboolean nm_system_device_set_ip4_ptp_address_with_iface (NMDevice *dev,
memset (&ifr2, 0, sizeof (struct ifreq)); memset (&ifr2, 0, sizeof (struct ifreq));
memcpy (ifr2.ifr_name, iface, strlen (iface)); memcpy (ifr2.ifr_name, iface, strlen (iface));
if (ioctl (nm_dev_sock_get_fd (sk), SIOCGIFFLAGS, &ifr2) >= 0)
#ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IFFLAGS (ptp)\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCGIFFLAGS, &ifr2);
#ifdef IOCTL_DEBUG
nm_info ("%s: About to GET IFFLAGS (ptp)\n", nm_device_get_iface (dev));
#endif
if (err >= 0)
{ {
memcpy (ifr2.ifr_name, iface, strlen (iface)); memcpy (ifr2.ifr_name, iface, strlen (iface));
ifr2.ifr_flags |= IFF_POINTOPOINT; ifr2.ifr_flags |= IFF_POINTOPOINT;
if (ioctl (nm_dev_sock_get_fd (sk), SIOCSIFFLAGS, &ifr2) >= 0)
#ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFFLAGS (ptp)\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCSIFFLAGS, &ifr2);
#ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFFLAGS (ptp)\n", nm_device_get_iface (dev));
#endif
if (err >= 0)
{ {
success = TRUE; success = TRUE;
nm_info ("Your Point-to-Point IP address = %u.%u.%u.%u", nm_info ("Your Point-to-Point IP address = %u.%u.%u.%u",
@@ -529,9 +584,10 @@ static gboolean nm_system_device_set_ip4_netmask (NMDevice *dev, int ip4_netmask
static gboolean nm_system_device_set_ip4_netmask_with_iface (NMDevice *dev, const char *iface, int ip4_netmask) static gboolean nm_system_device_set_ip4_netmask_with_iface (NMDevice *dev, const char *iface, int ip4_netmask)
{ {
struct ifreq ifr; struct ifreq ifr;
NMSock *sk; NMSock * sk;
gboolean success = FALSE; gboolean success = FALSE;
struct sockaddr_in *p = (struct sockaddr_in *)&(ifr.ifr_addr); struct sockaddr_in *p = (struct sockaddr_in *)&(ifr.ifr_addr);
int err;
g_return_val_if_fail (iface != NULL, FALSE); g_return_val_if_fail (iface != NULL, FALSE);
@@ -542,13 +598,21 @@ static gboolean nm_system_device_set_ip4_netmask_with_iface (NMDevice *dev, cons
memcpy (ifr.ifr_name, iface, strlen (iface)); memcpy (ifr.ifr_name, iface, strlen (iface));
p->sin_family = AF_INET; p->sin_family = AF_INET;
p->sin_addr.s_addr = ip4_netmask; p->sin_addr.s_addr = ip4_netmask;
if (ioctl (nm_dev_sock_get_fd (sk), SIOCSIFNETMASK, &ifr) == -1) #ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFNETMASK\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCSIFNETMASK, &ifr);
#ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFNETMASK\n", nm_device_get_iface (dev));
#endif
if (err == -1)
nm_warning ("nm_system_device_set_ip4_netmask (%s): failed to set IPv4 netmask! errno = %s", iface, strerror (errno)); nm_warning ("nm_system_device_set_ip4_netmask (%s): failed to set IPv4 netmask! errno = %s", iface, strerror (errno));
else else
success = TRUE; success = TRUE;
nm_dev_sock_close (sk); nm_dev_sock_close (sk);
return (success); return success;
} }
@@ -568,9 +632,10 @@ static gboolean nm_system_device_set_ip4_broadcast (NMDevice *dev, int ip4_broad
static gboolean nm_system_device_set_ip4_broadcast_with_iface (NMDevice *dev, const char *iface, int ip4_broadcast) static gboolean nm_system_device_set_ip4_broadcast_with_iface (NMDevice *dev, const char *iface, int ip4_broadcast)
{ {
struct ifreq ifr; struct ifreq ifr;
NMSock *sk; NMSock * sk;
gboolean success = FALSE; gboolean success = FALSE;
struct sockaddr_in *p = (struct sockaddr_in *)&(ifr.ifr_addr); struct sockaddr_in *p = (struct sockaddr_in *)&(ifr.ifr_addr);
int err;
g_return_val_if_fail (iface != NULL, FALSE); g_return_val_if_fail (iface != NULL, FALSE);
@@ -581,13 +646,21 @@ static gboolean nm_system_device_set_ip4_broadcast_with_iface (NMDevice *dev, co
memcpy (ifr.ifr_name, iface, strlen (iface)); memcpy (ifr.ifr_name, iface, strlen (iface));
p->sin_family = AF_INET; p->sin_family = AF_INET;
p->sin_addr.s_addr = ip4_broadcast; p->sin_addr.s_addr = ip4_broadcast;
if (ioctl (nm_dev_sock_get_fd (sk), SIOCSIFBRDADDR, &ifr) == -1) #ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFBRDADDR\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCSIFBRDADDR, &ifr);
#ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFBRDADDR\n", nm_device_get_iface (dev));
#endif
if (err == -1)
nm_warning ("nm_system_device_set_ip4_netmask (%s): failed to set IPv4 broadcast address!", iface); nm_warning ("nm_system_device_set_ip4_netmask (%s): failed to set IPv4 broadcast address!", iface);
else else
success = TRUE; success = TRUE;
nm_dev_sock_close (sk); nm_dev_sock_close (sk);
return (success); return success;
} }
@@ -620,8 +693,9 @@ static gboolean nm_system_device_set_mtu (NMDevice *dev, guint16 in_mtu)
static gboolean nm_system_device_set_mtu_with_iface (NMDevice *dev, const char *iface, guint16 in_mtu) static gboolean nm_system_device_set_mtu_with_iface (NMDevice *dev, const char *iface, guint16 in_mtu)
{ {
struct ifreq ifr; struct ifreq ifr;
NMSock *sk; NMSock * sk;
gboolean success = FALSE; gboolean success = FALSE;
int err;
g_return_val_if_fail (iface != NULL, FALSE); g_return_val_if_fail (iface != NULL, FALSE);
@@ -631,13 +705,21 @@ static gboolean nm_system_device_set_mtu_with_iface (NMDevice *dev, const char *
memset (&ifr, 0, sizeof (struct ifreq)); memset (&ifr, 0, sizeof (struct ifreq));
memcpy (ifr.ifr_name, iface, strlen (iface)); memcpy (ifr.ifr_name, iface, strlen (iface));
ifr.ifr_mtu = in_mtu; ifr.ifr_mtu = in_mtu;
if (ioctl (nm_dev_sock_get_fd (sk), SIOCSIFMTU, &ifr) == -1) #ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFMTU\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCSIFMTU, &ifr);
#ifdef IOCTL_DEBUG
nm_info ("%s: About to SET IFMTU\n", nm_device_get_iface (dev));
#endif
if (err == -1)
nm_warning ("nm_system_device_set_mtu (%s): failed to set mtu! errno = %s", iface, strerror (errno)); nm_warning ("nm_system_device_set_mtu (%s): failed to set mtu! errno = %s", iface, strerror (errno));
else else
success = TRUE; success = TRUE;
nm_dev_sock_close (sk); nm_dev_sock_close (sk);
return (success); return success;
} }
static gboolean nm_system_device_set_ip4_route_with_iface (NMDevice *dev, const char *iface, int ip4_gateway, int ip4_dest, int ip4_netmask) static gboolean nm_system_device_set_ip4_route_with_iface (NMDevice *dev, const char *iface, int ip4_gateway, int ip4_dest, int ip4_netmask)
@@ -646,6 +728,7 @@ static gboolean nm_system_device_set_ip4_route_with_iface (NMDevice *dev, const
gboolean success = FALSE; gboolean success = FALSE;
struct rtentry rtent; struct rtentry rtent;
struct sockaddr_in *p; struct sockaddr_in *p;
int err;
g_return_val_if_fail (iface != NULL, FALSE); g_return_val_if_fail (iface != NULL, FALSE);
@@ -667,7 +750,15 @@ static gboolean nm_system_device_set_ip4_route_with_iface (NMDevice *dev, const
rtent.rt_window = 0; rtent.rt_window = 0;
rtent.rt_flags = RTF_UP | RTF_GATEWAY | (rtent.rt_window ? RTF_WINDOW : 0); rtent.rt_flags = RTF_UP | RTF_GATEWAY | (rtent.rt_window ? RTF_WINDOW : 0);
if (ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent) == -1) #ifdef IOCTL_DEBUG
nm_info ("%s: About to CADDRT\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent);
#ifdef IOCTL_DEBUG
nm_info ("%s: About to CADDRT\n", nm_device_get_iface (dev));
#endif
if (err == -1)
{ {
if (errno == ENETUNREACH) /* possibly gateway is over the bridge */ if (errno == ENETUNREACH) /* possibly gateway is over the bridge */
{ /* try adding a route to gateway first */ { /* try adding a route to gateway first */
@@ -686,9 +777,25 @@ static gboolean nm_system_device_set_ip4_route_with_iface (NMDevice *dev, const
rtent2.rt_metric = 0; rtent2.rt_metric = 0;
rtent2.rt_flags = RTF_UP | RTF_HOST; rtent2.rt_flags = RTF_UP | RTF_HOST;
if (ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent2) == 0 ) #ifdef IOCTL_DEBUG
nm_info ("%s: About to CADDRT (2)\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent2);
#ifdef IOCTL_DEBUG
nm_info ("%s: About to CADDRT (2)\n", nm_device_get_iface (dev));
#endif
if (err == 0)
{ {
if (ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent) == 0 ) #ifdef IOCTL_DEBUG
nm_info ("%s: About to CADDRT (3)\n", nm_device_get_iface (dev));
#endif
err = ioctl (nm_dev_sock_get_fd (sk), SIOCADDRT, &rtent);
#ifdef IOCTL_DEBUG
nm_info ("%s: About to CADDRT (3)\n", nm_device_get_iface (dev));
#endif
if (err == 0)
success = TRUE; success = TRUE;
else else
nm_warning ("nm_system_device_set_ip4_route_with_iface (%s): failed to set IPv4 default route! errno = %d", iface, errno); nm_warning ("nm_system_device_set_ip4_route_with_iface (%s): failed to set IPv4 default route! errno = %d", iface, errno);