Replaced tabs with 4 whitespaces and removed trailing whitespaces.

Signed-off-by: Victor Toni <[email protected]>

Author: ViToni

src/callout.c

@@ -1,5 +1,5 @@
 /*
-**  igmpproxy - IGMP proxy based multicast router 
+**  igmpproxy - IGMP proxy based multicast router
 **  Copyright (C) 2005 Johnny Egeland <[email protected]>
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -41,7 +41,7 @@ static struct timeOutQueue  *queue = 0; /* pointer to the beginning of timeout q
 
 struct timeOutQueue {
     struct timeOutQueue    *next;   // Next event in queue
-    int                     id;  
+    int                     id;
     timer_f                 func;   // function to call
     void                    *data;  // Data for function
     int                     time;   // Time offset for next event
@@ -131,19 +131,19 @@ int timer_nextTimer(void) {
  *  @param data - Pointer to the function data to supply...
  */
 int timer_setTimer(int delay, timer_f action, void *data) {
-    struct     timeOutQueue  *ptr, *node, *prev;
+    struct timeOutQueue  *ptr, *node, *prev;
     int i = 0;
 
-    /* create a node */ 
+    /* create a node */
     node = (struct timeOutQueue *)malloc(sizeof(struct timeOutQueue));
     if (node == 0) {
         my_log(LOG_WARNING, 0, "Malloc Failed in timer_settimer\n");
         return -1;
     }
-    node->func = action; 
+    node->func = action;
     node->data = data;
-    node->time = delay; 
-    node->next = 0; 
+    node->time = delay;
+    node->next = 0;
     node->id   = ++id;
 
     prev = ptr = queue;
@@ -167,10 +167,10 @@ int timer_setTimer(int delay, timer_f action, void *data) {
                     prev->next = node;
                 }
                 ptr->time -= node->time;
-		my_log(LOG_DEBUG, 0,
-			"Created timeout %d (#%d) - delay %d secs",
-			node->id, i, node->time);
-		debugQueue();
+                my_log(LOG_DEBUG, 0,
+                    "Created timeout %d (#%d) - delay %d secs",
+                    node->id, i, node->time);
+                debugQueue();
                 return node->id;
             } else {
                 // Continur to check nodes.
@@ -182,15 +182,15 @@ int timer_setTimer(int delay, timer_f action, void *data) {
         }
         prev->next = node;
     }
-    my_log(LOG_DEBUG, 0, "Created timeout %d (#%d) - delay %d secs", 
+    my_log(LOG_DEBUG, 0, "Created timeout %d (#%d) - delay %d secs",
             node->id, i, node->time);
     debugQueue();
 
     return node->id;
 }
 
 /**
-*   returns the time until the timer is scheduled 
+*   returns the time until the timer is scheduled
 */
 int timer_leftTimer(int timer_id) {
     struct timeOutQueue *ptr;
@@ -209,7 +209,7 @@ int timer_leftTimer(int timer_id) {
 }
 
 /**
-*   clears the associated timer.  Returns 1 if succeeded. 
+*   clears the associated timer.  Returns 1 if succeeded.
 */
 int timer_clearTimer(int  timer_id) {
     struct timeOutQueue  *ptr, *prev;
@@ -264,6 +264,6 @@ static void debugQueue(void) {
     struct timeOutQueue  *ptr;
 
     for (ptr = queue; ptr; ptr = ptr->next) {
-            my_log(LOG_DEBUG, 0, "(Id:%d, Time:%d) ", ptr->id, ptr->time);
+        my_log(LOG_DEBUG, 0, "(Id:%d, Time:%d) ", ptr->id, ptr->time);
     }
 }

src/config.c

@@ -1,5 +1,5 @@
 /*
-**  igmpproxy - IGMP proxy based multicast router 
+**  igmpproxy - IGMP proxy based multicast router
 **  Copyright (C) 2005 Johnny Egeland <[email protected]>
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -33,12 +33,12 @@
 */
 /**
 *   config.c - Contains functions to load and parse config
-*              file, and functions to configure the daemon.              
+*              file, and functions to configure the daemon.
 */
 
 #include "igmpproxy.h"
-                                      
-// Structure to keep configuration for VIFs...    
+
+// Structure to keep configuration for VIFs...
 struct vifconfig {
     char*               name;
     short               state;
@@ -50,13 +50,13 @@ struct vifconfig {
 
     // Allowed Groups
     struct SubnetList*  allowedgroups;
-    
+
     // Next config in list...
     struct vifconfig*   next;
 };
-                 
+
 // Structure to keep vif configuration
-struct vifconfig*   vifconf;
+struct vifconfig *vifconf;
 
 // Keeps common settings...
 static struct Config commonConfig;
@@ -65,7 +65,6 @@ static struct Config commonConfig;
 struct vifconfig *parsePhyintToken(void);
 struct SubnetList *parseSubnetAddress(char *addrstr);
 
-
 /**
 *   Initializes common config..
 */
@@ -84,11 +83,10 @@ static void initCommonConfig(void) {
 
     // If 1, a leave message is sent upstream on leave messages from downstream.
     commonConfig.fastUpstreamLeave = 0;
-    
+
     // aimwang: default value
     commonConfig.defaultInterfaceState = IF_STATE_DISABLED;
     commonConfig.rescanVif = 0;
-
 }
 
 /**
@@ -99,14 +97,14 @@ struct Config *getCommonConfig(void) {
 }
 
 /**
-*   Loads the configuration from file, and stores the config in 
+*   Loads the configuration from file, and stores the config in
 *   respective holders...
-*/                 
+*/
 int loadConfig(char *configFile) {
     struct vifconfig  *tmpPtr;
     struct vifconfig  **currPtr = &vifconf;
     char *token;
-    
+
     // Initialize common config
     initCommonConfig();
 
@@ -146,29 +144,29 @@ int loadConfig(char *configFile) {
                 *currPtr = tmpPtr;
                 currPtr = &tmpPtr->next;
             }
-        } 
+        }
         else if(strcmp("quickleave", token)==0) {
             // Got a quickleave token....
             my_log(LOG_DEBUG, 0, "Config: Quick leave mode enabled.");
             commonConfig.fastUpstreamLeave = 1;
-            
+
             // Read next token...
             token = nextConfigToken();
             continue;
         }
         else if(strcmp("defaultdown", token)==0) {
-	    // Got a defaultdown token...
-	    my_log(LOG_DEBUG, 0, "Config: interface Default as down stream.");
-	    commonConfig.defaultInterfaceState = IF_STATE_DOWNSTREAM;
+            // Got a defaultdown token...
+            my_log(LOG_DEBUG, 0, "Config: interface Default as down stream.");
+            commonConfig.defaultInterfaceState = IF_STATE_DOWNSTREAM;
 
             // Read next token...
             token = nextConfigToken();
             continue;
         }
         else if(strcmp("rescanvif", token)==0) {
-	    // Got a defaultdown token...
-	    my_log(LOG_DEBUG, 0, "Config: Need detect new interace.");
-	    commonConfig.rescanVif = 1;
+            // Got a defaultdown token...
+            my_log(LOG_DEBUG, 0, "Config: Need detect new interace.");
+            commonConfig.rescanVif = 1;
 
             // Read next token...
             token = nextConfigToken();
@@ -216,19 +214,19 @@ void configureVifs(void) {
                     my_log(LOG_DEBUG, 0, "Found config for %s", Dp->Name);
 
 
-                    // Set the VIF state 
+                    // Set the VIF state
                     Dp->state = confPtr->state;
-                    
+
                     Dp->threshold = confPtr->threshold;
                     Dp->ratelimit = confPtr->ratelimit;
 
                     // Go to last allowed net on VIF...
                     for(vifLast = Dp->allowednets; vifLast->next; vifLast = vifLast->next);
-                        
+
                     // Insert the configured nets...
                     vifLast->next = confPtr->allowednets;
 
-		    Dp->allowedgroups = confPtr->allowedgroups;
+                    Dp->allowedgroups = confPtr->allowedgroups;
 
                     break;
                 }
@@ -277,7 +275,7 @@ struct vifconfig *parsePhyintToken(void) {
 
     // Set the altnet pointer to the allowednets pointer.
     anetPtr = &tmpPtr->allowednets;
-    agrpPtr = &tmpPtr->allowedgroups; 
+    agrpPtr = &tmpPtr->allowedgroups;
 
     // Parse the rest of the config..
     token = nextConfigToken();
@@ -296,20 +294,20 @@ struct vifconfig *parsePhyintToken(void) {
                 anetPtr = &(*anetPtr)->next;
             }
         }
-	else if(strcmp("whitelist", token)==0) {
-	    // Whitelist
-	    token = nextConfigToken();
-	    my_log(LOG_DEBUG, 0, "Config: IF: Got whitelist token %s.", token);
-	
-	    *agrpPtr = parseSubnetAddress(token);
-	    if(*agrpPtr == NULL) {
-		parseError = 1;
-		my_log(LOG_WARNING, 0, "Unable to parse subnet address.");
-		break;
-	    } else {
-		agrpPtr = &(*agrpPtr)->next;
-	    }
-	}
+        else if(strcmp("whitelist", token)==0) {
+            // Whitelist
+            token = nextConfigToken();
+            my_log(LOG_DEBUG, 0, "Config: IF: Got whitelist token %s.", token);
+
+            *agrpPtr = parseSubnetAddress(token);
+            if(*agrpPtr == NULL) {
+                parseError = 1;
+                my_log(LOG_WARNING, 0, "Unable to parse subnet address.");
+                break;
+            } else {
+                agrpPtr = &(*agrpPtr)->next;
+            }
+        }
         else if(strcmp("upstream", token)==0) {
             // Upstream
             my_log(LOG_DEBUG, 0, "Config: IF: Got upstream token.");
@@ -369,10 +367,10 @@ struct vifconfig *parsePhyintToken(void) {
 *   a.b.c.d/n into a SubnetList entry.
 */
 struct SubnetList *parseSubnetAddress(char *addrstr) {
-    struct SubnetList *tmpSubnet;
-    char        *tmpStr;
-    uint32_t      addr = 0x00000000;
-    uint32_t      mask = 0xFFFFFFFF;
+    struct SubnetList   *tmpSubnet;
+    char                *tmpStr;
+    uint32_t            addr = 0x00000000;
+    uint32_t            mask = 0xFFFFFFFF;
 
     // First get the network part of the address...
     tmpStr = strtok(addrstr, "/");
@@ -403,7 +401,7 @@ struct SubnetList *parseSubnetAddress(char *addrstr) {
     tmpSubnet->next = NULL;
 
     my_log(LOG_DEBUG, 0, "Config: IF: Altnet: Parsed altnet to %s.",
-	    inetFmts(tmpSubnet->subnet_addr, tmpSubnet->subnet_mask,s1));
+            inetFmts(tmpSubnet->subnet_addr, tmpSubnet->subnet_mask,s1));
 
     return tmpSubnet;
 }

src/confread.c

@@ -1,5 +1,5 @@
 /*
-**  igmpproxy - IGMP proxy based multicast router 
+**  igmpproxy - IGMP proxy based multicast router
 **  Copyright (C) 2005 Johnny Egeland <[email protected]>
 **
 **  This program is free software; you can redistribute it and/or modify
@@ -38,19 +38,19 @@
 *   and read the tokens from it. The parser is really simple,
 *   and does no backlogging. This means that no form of
 *   text escaping and qouting is currently supported.
-*   '#' chars are read as comments, and the comment lasts until 
+*   '#' chars are read as comments, and the comment lasts until
 *   a newline or EOF
 *
 */
 
 #include "igmpproxy.h"
 
-#define     READ_BUFFER_SIZE    512   // Inputbuffer size...
-        
+#define READ_BUFFER_SIZE    512     // Inputbuffer size...
+
 #ifndef MAX_TOKEN_LENGTH
-  #define MAX_TOKEN_LENGTH  30     // Default max token length
+    #define MAX_TOKEN_LENGTH  30    // Default max token length
 #endif
-                                     
+
 FILE            *confFilePtr;       // File handle pointer
 char            *iBuffer;           // Inputbuffer for reading...
 unsigned int    bufPtr;             // Buffer position pointer.
@@ -60,28 +60,28 @@ short   validToken;
 
 /**
 *   Opens config file specified by filename.
-*/    
+*/
 int openConfigFile(char *filename) {
 
     // Set the buffer to null initially...
     iBuffer = NULL;
 
     // Open the file for reading...
     confFilePtr = fopen(filename, "r");
-    
+
     // On error, return false
     if(confFilePtr == NULL) {
         return 0;
     }
-    
+
     // Allocate memory for inputbuffer...
     iBuffer = (char*) malloc( sizeof(char) * READ_BUFFER_SIZE );
-    
+
     if(iBuffer == NULL) {
         closeConfigFile();
         return 0;
     }
-    
+
     // Reset bufferpointer and readsize
     bufPtr = 0;
     readSize = 0;
@@ -105,7 +105,7 @@ void closeConfigFile(void) {
 
 /**
 *   Returns the next token from the configfile. The function
-*   return NULL if there are no more tokens in the file.    
+*   return NULL if there are no more tokens in the file.
 */
 char *nextConfigToken(void) {
 
@@ -174,7 +174,6 @@ char *nextConfigToken(void) {
                         cToken[tokenPtr++] = iBuffer[bufPtr];
                         break;
                     }
-                
                 }
 
                 // Check end of token buffer !!!
@@ -211,4 +210,3 @@ char *nextConfigToken(void) {
 char *getCurrentConfigToken(void) {
     return validToken ? cToken : NULL;
 }
-