Renamed 'upStreamVif' to 'upStreamIfIdx' for clarity.

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

Author: ViToni

src/igmp.c

@@ -142,10 +142,10 @@ void acceptIgmp(int recvlen) {
 
             for(i=0; i<MAX_UPS_VIFS; i++)
             {
-                if(-1 != upStreamVif[i])
+                if(-1 != upStreamIfIdx[i])
                 {
                     // Check if the source address matches a valid address on upstream vif.
-                    checkVIF = getIfByIx( upStreamVif[i] );
+                    checkVIF = getIfByIx( upStreamIfIdx[i] );
                     if(checkVIF == 0) {
                         my_log(LOG_ERR, 0, "Upstream VIF was null.");
                         return;

src/igmpproxy.c

@@ -62,8 +62,8 @@ static int sighandled = 0;
 #define GOT_SIGUSR1 0x04
 #define GOT_SIGUSR2 0x08
 
-// The upstream VIF index
-int     upStreamVif[MAX_UPS_VIFS];
+// Holds the indeces of the upstream IF...
+int     upStreamIfIdx[MAX_UPS_VIFS];
 
 /**
 *   Program main method. Is invoked when the program is started
@@ -187,9 +187,10 @@ int igmpProxyInit(void) {
         struct IfDesc *Dp;
         int     vifcount = 0, upsvifcount = 0;
 
+        // init array to "not set"
         for ( Ix = 0; Ix < MAX_UPS_VIFS; Ix++)
         {
-            upStreamVif[Ix] = -1;
+            upStreamIfIdx[Ix] = -1;
         }
 
         for ( Ix = 0; (Dp = getIfByIx(Ix)); Ix++ ) {
@@ -198,7 +199,9 @@ int igmpProxyInit(void) {
                 if(Dp->state == IF_STATE_UPSTREAM) {
                     if (upsvifcount < MAX_UPS_VIFS -1)
                     {
-                        upStreamVif[upsvifcount++] = Ix;
+                        my_log(LOG_DEBUG, 0, "Found upstrem IF #%d, will assing as upstream Vif %d",
+                            upsvifcount, Ix);
+                        upStreamIfIdx[upsvifcount++] = Ix;
                     } else {
                         my_log(LOG_ERR, 0, "Cannot set VIF #%d as upstream as well. Mac upstream Vif count is %d",
                             Ix, MAX_UPS_VIFS);

src/igmpproxy.h

@@ -179,8 +179,8 @@ struct Config {
     //~ aimwang added done
 };
 
-// Defines the Index of the upstream VIF...
-extern int upStreamVif[MAX_UPS_VIFS];
+// Holds the indeces of the upstream IF...
+extern int upStreamIfIdx[MAX_UPS_VIFS];
 
 /* ifvc.c
  */

src/rttable.c

@@ -122,10 +122,10 @@ static void sendJoinLeaveUpstream(struct RouteTable* route, int join) {
 
     for(i=0; i<MAX_UPS_VIFS; i++)
     {
-        if (-1 != upStreamVif[i])
+        if (-1 != upStreamIfIdx[i])
         {
-            // Get the upstream VIF...
-            upstrIf = getIfByIx( upStreamVif[i] );
+            // Get the upstream IF...
+            upstrIf = getIfByIx( upStreamIfIdx[i] );
             if(upstrIf == NULL) {
                 my_log(LOG_ERR, 0 ,"FATAL: Unable to get Upstream IF.");
             }