ipfw2 - Final whitespace cleanup
authorMatthew Dillon <dillon@apollo.backplane.com>
Thu, 12 Mar 2015 21:33:36 +0000 (14:33 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Thu, 12 Mar 2015 21:33:36 +0000 (14:33 -0700)
* Do final cleanup of a few more whitespace issues

lib/libipfw2/dummynet/ipfw2_dummynet.c
sys/net/ipfw2_nat/ip_fw2_nat.h
sys/net/libalias/alias.c
sys/net/libalias/alias_nbt.c
sys/net/libalias/alias_smedia.c

index e6edd98..1dfb022 100644 (file)
@@ -89,4 +89,3 @@ load_module(register_func function, register_keyword keyword)
        function(MODULE_DUMMYNET_ID,O_DUMMYNET_QUEUE,
                        (parser_func)parse_queue, (shower_func)show_queue);
 }
-
index b3bde46..27c5ea0 100644 (file)
@@ -98,8 +98,8 @@ struct cfg_nat {
 
 /* Nat command. */
 typedef struct _ipfw_insn_nat {
-       ipfw_insn       o;
-       struct cfg_nat *nat;
+       ipfw_insn       o;
+       struct cfg_nat *nat;
 } ipfw_insn_nat;
 
 #define LOOKUP_NAT(l, i, p) do {                       \
index b1c8f0f..4749c67 100644 (file)
@@ -1250,7 +1250,7 @@ LibAliasInLocked(struct libalias *la, char *ptr, int maxpacketsize)
                case IPPROTO_TCP:
                        iresult = TcpAliasIn(la, pip);
                        break;
-               case IPPROTO_GRE: {
+               case IPPROTO_GRE: {
                        int error;
                        struct alias_data ad = {
                                .lnk = NULL,
@@ -1392,7 +1392,7 @@ LibAliasOutLocked(struct libalias *la, char *ptr, /* valid IP packet */
                        case IPPROTO_TCP:
                        iresult = TcpAliasOut(la, pip, maxpacketsize, create);
                        break;
-               case IPPROTO_GRE: {
+               case IPPROTO_GRE: {
                        int error;
                        struct alias_data ad = {
                                .lnk = NULL,
@@ -1406,11 +1406,11 @@ LibAliasOutLocked(struct libalias *la, char *ptr,       /* valid IP packet */
                        /* Walk out chain. */
                        error = find_handler(OUT, IP, la, pip, &ad);
                        if (error == 0)
-                               iresult = PKT_ALIAS_OK;
-                       else
-                               iresult = ProtoAliasOut(la, pip, create);
+                               iresult = PKT_ALIAS_OK;
+                       else
+                               iresult = ProtoAliasOut(la, pip, create);
                }
-                       break;
+                       break;
                default:
                        iresult = ProtoAliasOut(la, pip, create);
                        break;
index 1170703..322431c 100644 (file)
@@ -114,7 +114,7 @@ protohandler2in(struct libalias *la, struct ip *pip, struct alias_data *ah)
 {
 
        AliasHandleUdpNbtNS(la, pip, ah->lnk, ah->aaddr, ah->aport,
-                           ah->oaddr, ah->dport);
+                           ah->oaddr, ah->dport);
        return (0);
 }
 
@@ -123,7 +123,7 @@ protohandler2out(struct libalias *la, struct ip *pip, struct alias_data *ah)
 {
 
        AliasHandleUdpNbtNS(la, pip, ah->lnk, &pip->ip_src, ah->sport,
-                           ah->aaddr, ah->aport);
+                           ah->aaddr, ah->aport);
        return (0);
 }
 
index c2e6ca7..ce248e0 100644 (file)
@@ -155,7 +155,7 @@ protohandler(struct libalias *la, struct ip *pip, struct alias_data *ah)
 
        if (ntohs(*ah->dport) == TFTP_PORT_NUMBER)
                FindRtspOut(la, pip->ip_src, pip->ip_dst,
-                           *ah->sport, *ah->aport, IPPROTO_UDP);
+                           *ah->sport, *ah->aport, IPPROTO_UDP);
        else AliasHandleRtspOut(la, pip, ah->lnk, ah->maxpktsize);
        return (0);
 }