Make the code format more in line with style(9).

Update loadalias to use the new libalias api.
Update to version 1.1.

1 files changed, 145 insertions, 158 deletions

diff --git a/usr.sbin/ppp/nat_cmd.c b/usr.sbin/ppp/nat_cmd.c
index f6aa1be..575a01c 100644
--- a/usr.sbin/ppp/nat_cmd.c
+++ b/usr.sbin/ppp/nat_cmd.c
@@ -15,198 +15,185 @@
 #include "vars.h"
 
 static int
-StrToAddr (char *, struct in_addr* addr);
+    StrToAddr(char *, struct in_addr * addr);
 
 static int
-StrToPort (char *, u_short *port, char *proto);
+    StrToPort(char *, u_short * port, char *proto);
 
 static int
-StrToAddrAndPort (char *, struct in_addr *addr, u_short *port, char *proto);
+    StrToAddrAndPort(char *, struct in_addr * addr, u_short * port, char *proto);
 
 
 int
-AliasRedirectPort (struct cmdtab *list,
-                   int argc,
-                   char **argv,
-                   void *param)
+AliasRedirectPort(struct cmdtab * list,
+		  int argc,
+		  char **argv,
+		  void *param)
 {
-    if (!(mode & MODE_ALIAS)) {
-	if (VarTerm)
-          fprintf(VarTerm, "Alias not enabled\n");
-    } else if (argc == 3) {
-        char proto_constant;
-        char *proto;
-        u_short local_port;
-        u_short alias_port;
-        int error;
-        struct in_addr local_addr;
-        struct in_addr null_addr;
-        struct alias_link *link;
-
-        proto = argv[0];
-        if (strcmp(proto, "tcp") == 0) {
-            proto_constant = IPPROTO_TCP;
-        } else if (strcmp(proto, "udp") == 0) {
-            proto_constant = IPPROTO_UDP;
-        } else {
-	    if (VarTerm) {
-              fprintf(VarTerm, "port redirect: protocol must be tcp or udp\n"); 
-              fprintf(VarTerm, "Usage: alias %s %s\n", list->name,
-		      list->syntax);
-	    }
-            return 1;
-        }
-
-        error = StrToAddrAndPort(argv[1], &local_addr, &local_port, proto);
-        if (error) {
-	  if (VarTerm) {
-            fprintf(VarTerm, "port redirect: error reading local addr:port\n");
-            fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
-	  }
-          return 1;
-        }
-
-        error = StrToPort(argv[2], &alias_port, proto);
-        if (error) {
-	  if (VarTerm) {
-            fprintf(VarTerm, "port redirect: error reading alias port\n");
-            fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
-	  }
-          return 1;
-        }
-
-        null_addr.s_addr = 0;
-
-        link = VarPacketAliasRedirectPort(local_addr, local_port,
-                                        null_addr,  0,
-                                        null_addr,  alias_port,
-                                        proto_constant);
-
-        if (link == NULL && VarTerm)
-            fprintf(VarTerm, "port redirect: error returned by packed"
-		    " aliasing engine (code=%d)\n", error);
-    } else if (VarTerm)
-        fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
-
-    return 1;
+  if (!(mode & MODE_ALIAS)) {
+    if (VarTerm)
+      fprintf(VarTerm, "Alias not enabled\n");
+  } else if (argc == 3) {
+    char proto_constant;
+    char *proto;
+    u_short local_port;
+    u_short alias_port;
+    int error;
+    struct in_addr local_addr;
+    struct in_addr null_addr;
+    struct alias_link *link;
+
+    proto = argv[0];
+    if (strcmp(proto, "tcp") == 0) {
+      proto_constant = IPPROTO_TCP;
+    } else if (strcmp(proto, "udp") == 0) {
+      proto_constant = IPPROTO_UDP;
+    } else {
+      if (VarTerm) {
+	fprintf(VarTerm, "port redirect: protocol must be tcp or udp\n");
+	fprintf(VarTerm, "Usage: alias %s %s\n", list->name,
+		list->syntax);
+      }
+      return 1;
+    }
+
+    error = StrToAddrAndPort(argv[1], &local_addr, &local_port, proto);
+    if (error) {
+      if (VarTerm) {
+	fprintf(VarTerm, "port redirect: error reading local addr:port\n");
+	fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
+      }
+      return 1;
+    }
+    error = StrToPort(argv[2], &alias_port, proto);
+    if (error) {
+      if (VarTerm) {
+	fprintf(VarTerm, "port redirect: error reading alias port\n");
+	fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
+      }
+      return 1;
+    }
+    null_addr.s_addr = 0;
+
+    link = VarPacketAliasRedirectPort(local_addr, local_port,
+				      null_addr, 0,
+				      null_addr, alias_port,
+				      proto_constant);
+
+    if (link == NULL && VarTerm)
+      fprintf(VarTerm, "port redirect: error returned by packed"
+	      " aliasing engine (code=%d)\n", error);
+  } else if (VarTerm)
+    fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
+
+  return 1;
 }
 
 
 int
-AliasRedirectAddr(struct cmdtab *list,
-                  int argc,
-                  char **argv,
-                  void *param)
+AliasRedirectAddr(struct cmdtab * list,
+		  int argc,
+		  char **argv,
+		  void *param)
 {
-    if (!(mode & MODE_ALIAS)) {
+  if (!(mode & MODE_ALIAS)) {
+    if (VarTerm)
+      fprintf(VarTerm, "alias not enabled\n");
+  } else if (argc == 2) {
+    int error;
+    struct in_addr local_addr;
+    struct in_addr alias_addr;
+    struct alias_link *link;
+
+    error = StrToAddr(argv[0], &local_addr);
+    if (error) {
       if (VarTerm)
-        fprintf(VarTerm, "alias not enabled\n");
-    } else if (argc == 2) {
-        int error;
-        struct in_addr local_addr;
-        struct in_addr alias_addr;
-        struct alias_link *link;
-
-        error = StrToAddr(argv[0], &local_addr);
-        if (error) {
-	    if (VarTerm)
-              fprintf(VarTerm, "address redirect: invalid local address\n");
-            return 1;
-        }
-
-        error = StrToAddr(argv[1], &alias_addr);
-        if (error) {
-	  if (VarTerm) {
-            fprintf(VarTerm, "address redirect: invalid alias address\n");
-            fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
-	  }
-          return 1;
-        }
-
-        link = VarPacketAliasRedirectAddr(local_addr, alias_addr);
-        if (link == NULL && VarTerm) {
-          fprintf(VarTerm, "address redirect: packet aliasing engine error\n");
-          fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
-        }
-    } else if (VarTerm)
-        fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
-
-    return 1;
+	fprintf(VarTerm, "address redirect: invalid local address\n");
+      return 1;
+    }
+    error = StrToAddr(argv[1], &alias_addr);
+    if (error) {
+      if (VarTerm) {
+	fprintf(VarTerm, "address redirect: invalid alias address\n");
+	fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
+      }
+      return 1;
+    }
+    link = VarPacketAliasRedirectAddr(local_addr, alias_addr);
+    if (link == NULL && VarTerm) {
+      fprintf(VarTerm, "address redirect: packet aliasing engine error\n");
+      fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
+    }
+  } else if (VarTerm)
+    fprintf(VarTerm, "Usage: alias %s %s\n", list->name, list->syntax);
+
+  return 1;
 }
 
 
 static int
-StrToAddr (char* str,
-           struct in_addr* addr)
+StrToAddr(char *str,
+	  struct in_addr * addr)
 {
-    struct hostent* hp;
-
-    if (inet_aton (str, addr))
-        return 0;
+  struct hostent *hp;
 
-    hp = gethostbyname (str);
-    if (!hp)
-    {
-        LogPrintf(LogWARN, "StrToAddr: Unknown host %s.\n", str);
-        return -1;
-    }
-
-    *addr = *((struct in_addr *) hp->h_addr);
+  if (inet_aton(str, addr))
     return 0;
+
+  hp = gethostbyname(str);
+  if (!hp) {
+    LogPrintf(LogWARN, "StrToAddr: Unknown host %s.\n", str);
+    return -1;
+  }
+  *addr = *((struct in_addr *) hp->h_addr);
+  return 0;
 }
 
 
 static int
-StrToPort (char *str,
-           u_short *port,
-           char *proto)
+StrToPort(char *str,
+	  u_short * port,
+	  char *proto)
 {
-    int iport;
-    struct servent* sp;
-    char* end;
-
-    iport = strtol (str, &end, 10);
-    if (end != str)
-    {
-        *port = htons(iport);
-        return 0;
-    }
-
-    sp = getservbyname (str, proto);
-    if (!sp)
-    {
-        LogPrintf(LogWARN, "StrToAddr: Unknown port or service %s/%s.\n",
-                  str, proto);
-        return -1;
-    }
+  int iport;
+  struct servent *sp;
+  char *end;
 
-    *port = sp->s_port;
+  iport = strtol(str, &end, 10);
+  if (end != str) {
+    *port = htons(iport);
     return 0;
+  }
+  sp = getservbyname(str, proto);
+  if (!sp) {
+    LogPrintf(LogWARN, "StrToAddr: Unknown port or service %s/%s.\n",
+	      str, proto);
+    return -1;
+  }
+  *port = sp->s_port;
+  return 0;
 }
 
 
 int
-StrToAddrAndPort (char* str,
-                  struct in_addr* addr,
-                  u_short *port,
-                  char *proto)
+StrToAddrAndPort(char *str,
+		 struct in_addr * addr,
+		 u_short * port,
+		 char *proto)
 {
-    char *ptr;
-
-    ptr = strchr (str, ':');
-    if (!ptr)
-    {
-        LogPrintf(LogWARN, "StrToAddrAndPort: %s is missing port number.\n",
-		  str);
-        return -1;
-    }
+  char *ptr;
 
-    *ptr = '\0';
-    ++ptr;
+  ptr = strchr(str, ':');
+  if (!ptr) {
+    LogPrintf(LogWARN, "StrToAddrAndPort: %s is missing port number.\n",
+	      str);
+    return -1;
+  }
+  *ptr = '\0';
+  ++ptr;
 
-    if (StrToAddr (str, addr) != 0)
-        return -1;
+  if (StrToAddr(str, addr) != 0)
+    return -1;
 
-    return StrToPort (ptr, port, proto);
+  return StrToPort(ptr, port, proto);
 }
-