Remove trailing whitespace from src/

5 files changed, 45 insertions, 49 deletions

diff --git a/src/fnet/Makefile.in b/src/fnet/Makefile.in
index 32f08882a..5932737ce 100644
--- a/src/fnet/Makefile.in
+++ b/src/fnet/Makefile.in
@@ -42,4 +42,3 @@ clean:; rm -f *.o fnet *.gcov *.gcda *.gcno
 
 distclean: clean
         rm -fr Makefile
-
diff --git a/src/fnet/arp.c b/src/fnet/arp.c
index a7f0a603a..4736f3509 100644
--- a/src/fnet/arp.c
+++ b/src/fnet/arp.c
@@ -48,12 +48,12 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) {
 
 //      printf("Scanning interface %s (%d.%d.%d.%d/%d)\n",
 //              dev, PRINT_IP(ifip & ifmask), mask2bits(ifmask));
-                        
+
         if (strlen(dev) > IFNAMSIZ) {
                 fprintf(stderr, "Error: invalid network device name %s\n", dev);
                 exit(1);
         }
-        
+
         // find interface mac address
         int sock;
         if ((sock = socket(AF_INET, SOCK_RAW, IPPROTO_RAW)) < 0)
@@ -70,7 +70,7 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) {
         // open layer2 socket
         if ((sock = socket(PF_PACKET, SOCK_RAW, htons (ETH_P_ALL))) < 0)
                 errExit("socket");
-        
+
         // try all possible ip addresses in ascending order
         uint32_t range = ~ifmask + 1; // the number of potential addresses
         // this software is not supported for /31 networks
@@ -90,7 +90,7 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) {
         struct timeval ts;
         ts.tv_sec = 2; // 2 seconds receive timeout
         ts.tv_usec = 0;
-        
+
         while (1) {
                 fd_set rfds;
                 FD_ZERO(&rfds);
@@ -101,21 +101,21 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) {
                 int maxfd = sock;
 
                 uint8_t frame[ETH_FRAME_LEN]; // includes eht header, vlan, and crc
-                memset(frame, 0, ETH_FRAME_LEN);        
+                memset(frame, 0, ETH_FRAME_LEN);
 
                 int nready;
                 if (dest < last)
                         nready = select(maxfd + 1,  &rfds, &wfds, (fd_set *) 0, NULL);
-                else            
+                else
                         nready = select(maxfd + 1,  &rfds,  (fd_set *) 0, (fd_set *) 0, &ts);
-                
+
                 if (nready < 0)
                         errExit("select");
-                        
+
                 if (nready == 0) { // timeout
                         break;
                 }
-                
+
                 if (FD_ISSET(sock, &wfds) && dest < last) {
                         // configure layer2 socket address information
                         struct sockaddr_ll addr;
@@ -125,7 +125,7 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) {
                         addr.sll_family = AF_PACKET;
                         memcpy (addr.sll_addr, mac, 6);
                         addr.sll_halen = htons(6);
-                
+
                         // build the arp packet header
                         ArpHdr hdr;
                         memset(&hdr, 0, sizeof(hdr));
@@ -138,7 +138,7 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) {
                         memcpy(hdr.sender_ip, (uint8_t *)&src, 4);
                         uint32_t dst = htonl(dest);
                         memcpy(hdr.target_ip, (uint8_t *)&dst, 4);
-                
+
                         // build ethernet frame
                         uint8_t frame[ETH_FRAME_LEN]; // includes eht header, vlan, and crc
                         memset(frame, 0, sizeof(frame));
@@ -147,16 +147,16 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) {
                         frame[12] = ETH_P_ARP / 256;
                         frame[13] = ETH_P_ARP % 256;
                         memcpy (frame + 14, &hdr, sizeof(hdr));
-                
+
                         // send packet
                         int len;
                         if ((len = sendto (sock, frame, 14 + sizeof(ArpHdr), 0, (struct sockaddr *) &addr, sizeof (addr))) <= 0)
                                 errExit("send");
-//printf("send %d bytes to %d.%d.%d.%d\n", len, PRINT_IP(dest));                
+//printf("send %d bytes to %d.%d.%d.%d\n", len, PRINT_IP(dest));
                         fflush(0);
                         dest++;
                 }
-                
+
                 if (FD_ISSET(sock, &rfds)) {
                         // read the incoming packet
                         int len = recvfrom(sock, frame, ETH_FRAME_LEN, 0, NULL, NULL);
@@ -185,24 +185,21 @@ void arp_scan(const char *dev, uint32_t ifip, uint32_t ifmask) {
                                         continue;
                                 memcpy(&ip, hdr.sender_ip, 4);
                                 ip = ntohl(ip);
-                                
+
                                 if (ip == last_ip) // filter duplicates
                                         continue;
                                 last_ip = ip;
-                                        
+
                                 // printing
                                 if (header_printed == 0) {
                                         printf("   Network scan:\n");
                                         header_printed = 1;
                                 }
                                 printf("   %02x:%02x:%02x:%02x:%02x:%02x\t%d.%d.%d.%d\n",
-                                        PRINT_MAC(hdr.sender_mac), PRINT_IP(ip));                                                                       
+                                        PRINT_MAC(hdr.sender_mac), PRINT_IP(ip));
                         }
                 }
         }
-        
+
         close(sock);
 }
-
-
-
diff --git a/src/fnet/interface.c b/src/fnet/interface.c
index 33ad766ec..8c1fd6ca4 100644
--- a/src/fnet/interface.c
+++ b/src/fnet/interface.c
@@ -40,7 +40,7 @@ static void check_if_name(const char *ifname) {
 void net_bridge_add_interface(const char *bridge, const char *dev) {
         check_if_name(bridge);
         check_if_name(dev);
-        
+
         // somehow adding the interface to the bridge resets MTU on bridge device!!!
         // workaround: restore MTU on the bridge device
         // todo: put a real fix in
@@ -82,7 +82,7 @@ void net_bridge_add_interface(const char *bridge, const char *dev) {
 // bring interface up
 void net_if_up(const char *ifname) {
         check_if_name(ifname);
-        
+
         int sock = socket(AF_INET,SOCK_DGRAM,0);
         if (sock < 0)
                 errExit("socket");
@@ -139,8 +139,8 @@ int net_get_mtu(const char *ifname) {
         if (ioctl(s, SIOCGIFMTU, (caddr_t)&ifr) == 0)
                 mtu = ifr.ifr_mtu;
         close(s);
-        
-        
+
+
         return mtu;
 }
 
@@ -197,7 +197,7 @@ void net_ifprint(int scan) {
                         sprintf(ipstr, "%d.%d.%d.%d", PRINT_IP(ip));
                         char maskstr[30];
                         sprintf(maskstr, "%d.%d.%d.%d", PRINT_IP(mask));
-                        
+
                         // mac address
                         unsigned char mac[6];
                         net_get_mac(ifa->ifa_name, mac);
@@ -207,7 +207,7 @@ void net_ifprint(int scan) {
                         else
                                 sprintf(macstr, "%02x:%02x:%02x:%02x:%02x:%02x", PRINT_MAC(mac));
 
-                        // print                                
+                        // print
                         printf("%-17.17s%-19.19s%-17.17s%-17.17s%-6.6s\n",
                                 ifa->ifa_name, macstr, ipstr, maskstr, status);
 
@@ -240,7 +240,7 @@ int net_get_mac(const char *ifname, unsigned char mac[6]) {
         memset(&ifr, 0, sizeof(ifr));
         strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
         ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
-        
+
         if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1)
                 errExit("ioctl");
         memcpy(mac, ifr.ifr_hwaddr.sa_data, 6);
@@ -262,7 +262,7 @@ void net_if_ip(const char *ifname, uint32_t ip, uint32_t mask, int mtu) {
         ifr.ifr_addr.sa_family = AF_INET;
 
         ((struct sockaddr_in *)&ifr.ifr_addr)->sin_addr.s_addr = htonl(ip);
-        if (ioctl( sock, SIOCSIFADDR, &ifr ) < 0) 
+        if (ioctl( sock, SIOCSIFADDR, &ifr ) < 0)
                 errExit("ioctl");
 
         if (ip != 0) {
@@ -270,7 +270,7 @@ void net_if_ip(const char *ifname, uint32_t ip, uint32_t mask, int mtu) {
                 if (ioctl( sock, SIOCSIFNETMASK, &ifr ) < 0)
                         errExit("ioctl");
         }
-        
+
         // configure mtu
         if (mtu > 0) {
                 ifr.ifr_mtu = mtu;
@@ -295,7 +295,7 @@ int net_if_mac(const char *ifname, const unsigned char mac[6]) {
         strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
         ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
         memcpy(ifr.ifr_hwaddr.sa_data, mac, 6);
-        
+
         if (ioctl(sock, SIOCSIFHWADDR, &ifr) == -1)
                 errExit("ioctl");
         close(sock);
@@ -315,7 +315,7 @@ void net_if_ip6(const char *ifname, const char *addr6) {
                 fprintf(stderr, "Error fnet: invalid IPv6 address %s\n", addr6);
                 exit(1);
         }
-        
+
         // extract prefix
         unsigned long prefix;
         char *ptr;
@@ -367,6 +367,6 @@ void net_if_ip6(const char *ifname, const char *addr6) {
                 perror("ioctl SIOCSIFADDR");
                 exit(1);
         }
-        
+
         close(sock);
 }
diff --git a/src/fnet/main.c b/src/fnet/main.c
index 0c55f3141..f44760b5c 100644
--- a/src/fnet/main.c
+++ b/src/fnet/main.c
@@ -41,7 +41,7 @@ int i;
 for (i = 0; i < argc; i++)
         printf("*%s* ", argv[i]);
 printf("\n");
-}       
+}
 #endif
         if (argc < 2) {
                 usage();
@@ -51,7 +51,7 @@ printf("\n");
         char *quiet = getenv("FIREJAIL_QUIET");
         if (quiet && strcmp(quiet, "yes") == 0)
                 arg_quiet = 1;
-                
+
         if (strcmp(argv[1], "-h") == 0 || strcmp(argv[1], "--help") == 0 || strcmp(argv[1], "-?") ==0) {
                 usage();
                 return 0;
diff --git a/src/fnet/veth.c b/src/fnet/veth.c
index 86d9d5190..d37c93a19 100644
--- a/src/fnet/veth.c
+++ b/src/fnet/veth.c
@@ -1,16 +1,16 @@
 /* code based on iproute2 ip/iplink.c, modified to be included in firejail project
  *
  * Original source code:
- * 
+ *
  * Information:
  *     http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2
- * 
+ *
  * Download:
  *     http://www.kernel.org/pub/linux/utils/net/iproute2/
- * 
+ *
  * Repository:
  *     git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git
- * 
+ *
  * License: GPL v2
  *
  * Original copyright header
@@ -112,7 +112,7 @@ int net_create_veth(const char *dev, const char *nsdev, unsigned pid) {
                 exit(2);
 
         rtnl_close(&rth);
-        
+
         return 0;
 }
 
@@ -134,13 +134,13 @@ int net_create_macvlan(const char *dev, const char *parent, unsigned pid) {
         req.n.nlmsg_flags = NLM_F_REQUEST|NLM_F_CREATE|NLM_F_EXCL;
         req.n.nlmsg_type = RTM_NEWLINK;
         req.i.ifi_family = 0;
-        
+
         // find parent ifindex
         int parent_ifindex = if_nametoindex(parent);
         if (parent_ifindex <= 0) {
                 fprintf(stderr, "Error: cannot find network device %s\n", parent);
                 exit(1);
-        }                       
+        }
 
         // add parent
         addattr_l(&req.n, sizeof(req), IFLA_LINK, &parent_ifindex, 4);
@@ -148,7 +148,7 @@ int net_create_macvlan(const char *dev, const char *parent, unsigned pid) {
         // add new interface name
         len = strlen(dev) + 1;
         addattr_l(&req.n, sizeof(req), IFLA_IFNAME, dev, len);
-        
+
         // place the interface in child namespace
         addattr_l (&req.n, sizeof(req), IFLA_NET_NS_PID, &pid, 4);
 
@@ -176,7 +176,7 @@ int net_create_macvlan(const char *dev, const char *parent, unsigned pid) {
                 exit(2);
 
         rtnl_close(&rth);
-        
+
         return 0;
 }
 
@@ -197,7 +197,7 @@ int net_move_interface(const char *dev, unsigned pid) {
         req.n.nlmsg_flags = NLM_F_REQUEST;
         req.n.nlmsg_type = RTM_NEWLINK;
         req.i.ifi_family = 0;
-        
+
         // find ifindex
         int ifindex = if_nametoindex(dev);
         if (ifindex <= 0) {
@@ -205,7 +205,7 @@ int net_move_interface(const char *dev, unsigned pid) {
                 exit(1);
         }
         req.i.ifi_index = ifindex;
-                                
+
         // place the interface in child namespace
         addattr_l (&req.n, sizeof(req), IFLA_NET_NS_PID, &pid, 4);
 
@@ -214,7 +214,7 @@ int net_move_interface(const char *dev, unsigned pid) {
                 exit(2);
 
         rtnl_close(&rth);
-        
+
         return 0;
 }
 
@@ -233,4 +233,4 @@ int main(int argc, char **argv) {
 
         return 0;
 }
-*/
\ No newline at end of file
+*/