reindent source

[people/ms/rstp.git] / netif_utils.c

diff --git a/netif_utils.c b/netif_utils.c
index a14e0c31d747aa55f1c368f0f3a55555c426622b..eeb12ff06b1cdd390613b4da19885a38b9d89743 100644 (file)
--- a/netif_utils.c
+++ b/netif_utils.c
@@ -40,62 +40,59 @@
 
 #include "log.h"
 
-
-
 int netsock = -1;
 
 int netsock_init(void)
 {
-  LOG("");
-  netsock = socket(AF_INET, SOCK_DGRAM, 0);
-  if (netsock < 0) {
-    ERROR("Couldn't open inet socket for ioctls: %m\n");
-    return -1;
-  }
-  return 0;
+       LOG("");
+       netsock = socket(AF_INET, SOCK_DGRAM, 0);
+       if (netsock < 0) {
+               ERROR("Couldn't open inet socket for ioctls: %m\n");
+               return -1;
+       }
+       return 0;
 }
 
 int get_hwaddr(char *ifname, unsigned char *hwaddr)
 {
-  struct ifreq ifr;
-  memset(&ifr, 0, sizeof(ifr));
-  strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-  if (ioctl(netsock, SIOCGIFHWADDR, &ifr) < 0) {
-    ERROR("%s: get hw address failed: %m", ifname);
-    return -1;
-  }
-  memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
-  return 0;
+       struct ifreq ifr;
+       memset(&ifr, 0, sizeof(ifr));
+       strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+       if (ioctl(netsock, SIOCGIFHWADDR, &ifr) < 0) {
+               ERROR("%s: get hw address failed: %m", ifname);
+               return -1;
+       }
+       memcpy(hwaddr, ifr.ifr_hwaddr.sa_data, ETH_ALEN);
+       return 0;
 }
 
 int ethtool_get_speed_duplex(char *ifname, int *speed, int *duplex)
 {
-  struct ifreq ifr;
-  memset(&ifr, 0, sizeof(ifr));
-  strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
-  struct ethtool_cmd ecmd;
-
-  ecmd.cmd = ETHTOOL_GSET;
-  ifr.ifr_data = (caddr_t)&ecmd;
-  if (ioctl(netsock, SIOCETHTOOL, &ifr) < 0) {
-    ERROR("Cannot get link status for %s: %m\n", ifname);
-    return -1;
-  }
-  *speed = ecmd.speed; /* Ethtool speed is in Mbps */
-  *duplex = ecmd.duplex; /* We have same convention as ethtool.
-                            0 = half, 1 = full */
-  return 0;
+       struct ifreq ifr;
+       memset(&ifr, 0, sizeof(ifr));
+       strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
+       struct ethtool_cmd ecmd;
+
+       ecmd.cmd = ETHTOOL_GSET;
+       ifr.ifr_data = (caddr_t) & ecmd;
+       if (ioctl(netsock, SIOCETHTOOL, &ifr) < 0) {
+               ERROR("Cannot get link status for %s: %m\n", ifname);
+               return -1;
+       }
+       *speed = ecmd.speed;    /* Ethtool speed is in Mbps */
+       *duplex = ecmd.duplex;  /* We have same convention as ethtool.
+                                  0 = half, 1 = full */
+       return 0;
 }
 
-
 /********* Sysfs based utility functions *************/
 
 /* This sysfs stuff might break with interface renames */
 int is_bridge(char *if_name)
 {
-  char path[32 + IFNAMSIZ];
-  sprintf(path, "/sys/class/net/%s/bridge", if_name);
-  return (access(path, R_OK) == 0);
+       char path[32 + IFNAMSIZ];
+       sprintf(path, "/sys/class/net/%s/bridge", if_name);
+       return (access(path, R_OK) == 0);
 }
 
 /* This will work even less if the bridge port is renamed after being
@@ -103,39 +100,38 @@ int is_bridge(char *if_name)
 */
 int is_bridge_slave(char *br_name, char *if_name)
 {
-  char path[32 + 2 * IFNAMSIZ];
-  sprintf(path, "/sys/class/net/%s/brif/%s", br_name, if_name);
-  return (access(path, R_OK) == 0);
+       char path[32 + 2 * IFNAMSIZ];
+       sprintf(path, "/sys/class/net/%s/brif/%s", br_name, if_name);
+       return (access(path, R_OK) == 0);
 }
 
 int get_bridge_portno(char *if_name)
 {
-  char path[32 + IFNAMSIZ];
-  sprintf(path, "/sys/class/net/%s/brport/port_no", if_name);
-  char buf[128];
-  int fd;
-  long res = -1;
-  TSTM((fd = open(path, O_RDONLY)) >= 0, -1, "%m");
-  int l;
-  TSTM((l = read(fd, buf, sizeof(buf) - 1)) >= 0, -1, "%m");
-  if (l == 0) {
-    ERROR("Empty port index file");
-    goto out;
-  }
-  else if (l == sizeof(buf) - 1) {
-    ERROR("port_index file too long");
-    goto out;
-  }
-  buf[l] = 0;
-  if (buf[l-1] == '\n')
-    buf[l-1] = 0;
-  char *end;
-  res = strtoul(buf, &end, 0);
-  if (*end != 0 || res > INT_MAX) {
-    ERROR("Invalid port index %s", buf);
-    res = -1;
-  }
- out:
-  close(fd);
-  return res;
+       char path[32 + IFNAMSIZ];
+       sprintf(path, "/sys/class/net/%s/brport/port_no", if_name);
+       char buf[128];
+       int fd;
+       long res = -1;
+       TSTM((fd = open(path, O_RDONLY)) >= 0, -1, "%m");
+       int l;
+       TSTM((l = read(fd, buf, sizeof(buf) - 1)) >= 0, -1, "%m");
+       if (l == 0) {
+               ERROR("Empty port index file");
+               goto out;
+       } else if (l == sizeof(buf) - 1) {
+               ERROR("port_index file too long");
+               goto out;
+       }
+       buf[l] = 0;
+       if (buf[l - 1] == '\n')
+               buf[l - 1] = 0;
+       char *end;
+       res = strtoul(buf, &end, 0);
+       if (*end != 0 || res > INT_MAX) {
+               ERROR("Invalid port index %s", buf);
+               res = -1;
+       }
+      out:
+       close(fd);
+       return res;
 }