@@ -299,7 +299,6 @@ void configureVifs(void) {
299299void createVifs (struct IfDescP * RebuildP ) {
300300 struct IfDesc * Dp , * oDp = NULL ;
301301 int vifcount = 0 , upsvifcount = 0 , Ix = 0 ;
302- bool join = false;
303302
304303 // init array to "not set"
305304 for (Ix = 0 ; Ix < MAX_UPS_VIFS ; Ix ++ ) {
@@ -332,13 +331,13 @@ void createVifs(struct IfDescP *RebuildP) {
332331 } else {
333332 /* Need rebuild, check if interface is new or already exists (check table below).
334333 old: disabled new: disabled -> do nothing
335- old: disabled new: downstream -> addVIF(new), joinmcroutergroups
334+ old: disabled new: downstream -> addVIF(new)
336335 old: disabled new: upstream -> addVIF(new)
337336 old: downstream new: disabled -> delVIF(old)
338337 state table old: downstream new: downstream -> addvif(new,old)
339338 old: downstream new: upstream -> delvif(old), addvif(new)
340339 old: upstream new: disabled -> clear routes oldvif, delVIF(old)
341- old: upstream new: downstream -> clear routes oldvif, delvif(old)),addvif(new), joinmcroutergroup
340+ old: upstream new: downstream -> clear routes oldvif, delvif(old)),addvif(new)
342341 old: upstream new: upstream -> addvif(new,old)
343342 */
344343 for (oDp = RebuildP -> S ; oDp < RebuildP -> E ; oDp ++ ) {
@@ -350,23 +349,23 @@ void createVifs(struct IfDescP *RebuildP) {
350349 switch (oDp -> state ) {
351350 case IF_STATE_DISABLED :
352351 switch (Dp -> state ) {
353- case IF_STATE_DISABLED : { continue ; }
354- case IF_STATE_DOWNSTREAM : { oDp = NULL ; join = true ; break ; }
355- case IF_STATE_UPSTREAM : { oDp = NULL ; break ; }
352+ case IF_STATE_DISABLED : { continue ; }
353+ case IF_STATE_DOWNSTREAM : { oDp = NULL ; break ; }
354+ case IF_STATE_UPSTREAM : { oDp = NULL ; break ; }
356355 }
357356 break ;
358357 case IF_STATE_DOWNSTREAM :
359358 switch (Dp -> state ) {
360- case IF_STATE_DISABLED : { delVIF (oDp ); continue ; }
361- case IF_STATE_DOWNSTREAM : { break ; }
362- case IF_STATE_UPSTREAM : { delVIF (oDp ); oDp = NULL ; break ; }
359+ case IF_STATE_DISABLED : { delVIF (oDp ); continue ; }
360+ case IF_STATE_DOWNSTREAM : { break ; }
361+ case IF_STATE_UPSTREAM : { delVIF (oDp ); oDp = NULL ; break ; }
363362 }
364363 break ;
365364 case IF_STATE_UPSTREAM :
366365 switch (Dp -> state ) {
367- case IF_STATE_DISABLED : { clearRoutes (); delVIF (oDp ); continue ; }
368- case IF_STATE_DOWNSTREAM : { clearRoutes (); delVIF (oDp ); oDp = NULL ; join = true; break ; }
369- case IF_STATE_UPSTREAM : { break ; }
366+ case IF_STATE_DISABLED : { clearRoutes (); delVIF (oDp ); continue ; }
367+ case IF_STATE_DOWNSTREAM : { clearRoutes (); delVIF (oDp ); oDp = NULL ; break ; }
368+ case IF_STATE_UPSTREAM : { break ; }
370369 }
371370 break ;
372371 }
@@ -391,9 +390,6 @@ void createVifs(struct IfDescP *RebuildP) {
391390 }
392391 }
393392 addVIF (Dp );
394- if (join ) {
395- joinMcRoutersGroup (Dp );
396- }
397393 vifcount ++ ;
398394 }
399395
0 commit comments