Merge pull request #10215 from FRRouting/revert-10164-name_change

Revert "pimd: Modifying members of pim_interface to accommodate IPv6 changes"

diff --cc pimd/pim_cmd.c
index 3b56e9b8b566d076e88f2a5dcebe276e59857fa0,501d69dbf5826eaf5e0486ce32aca72655c61bc9..86a09f72f9416f831410fc820d9efc560b1345c8
--- 1/pimd/pim_cmd.c
--- 2/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@@ -3571,10 -3576,11 +3576,11 @@@ static void igmp_show_sources(struct pi
                        continue;
  
                /* scan igmp groups */
-               for (ALL_LIST_ELEMENTS_RO(pim_ifp->group_list, grpnode, grp)) {
+               for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_group_list, grpnode,
+                                         grp)) {
                        char group_str[INET_ADDRSTRLEN];
                        struct listnode *srcnode;
 -                      struct igmp_source *src;
 +                      struct gm_source *src;
  
                        pim_inet4_dump("<group?>", grp->group_addr, group_str,
                                       sizeof(group_str));
@@@ -3626,10 -3632,11 +3632,11 @@@ static void igmp_show_source_retransmis
                        continue;
  
                /* scan igmp groups */
-               for (ALL_LIST_ELEMENTS_RO(pim_ifp->group_list, grpnode, grp)) {
+               for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_group_list, grpnode,
+                                         grp)) {
                        char group_str[INET_ADDRSTRLEN];
                        struct listnode *srcnode;
 -                      struct igmp_source *src;
 +                      struct gm_source *src;
  
                        pim_inet4_dump("<group?>", grp->group_addr, group_str,
                                       sizeof(group_str));

diff --cc pimd/pim_iface.c
index e5f5072e714d081a1e167e1672056022037364d2,8c03475ae54b9958c73f3403affcb0b30fa54448..5afd5cd2fe7e91620baca9a3cfc3c9dfe4c79ffc
--- 1/pimd/pim_iface.c
--- 2/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@@ -530,10 -532,10 +532,10 @@@ void pim_if_addr_add(struct connected *
        //  return;
  
        if (PIM_IF_TEST_IGMP(pim_ifp->options)) {
 -              struct igmp_sock *igmp;
 +              struct gm_sock *igmp;
  
                /* lookup IGMP socket */
-               igmp = pim_igmp_sock_lookup_ifaddr(pim_ifp->socket_list,
+               igmp = pim_igmp_sock_lookup_ifaddr(pim_ifp->igmp_socket_list,
                                                   ifaddr);
                if (!igmp) {
                        /* if addr new, add IGMP socket */
@@@ -547,13 -549,13 +549,13 @@@
                }
  
                /* Replay Static IGMP groups */
-               if (pim_ifp->join_list) {
+               if (pim_ifp->igmp_join_list) {
                        struct listnode *node;
                        struct listnode *nextnode;
 -                      struct igmp_join *ij;
 +                      struct gm_join *ij;
                        int join_fd;
  
-                       for (ALL_LIST_ELEMENTS(pim_ifp->join_list, node,
+                       for (ALL_LIST_ELEMENTS(pim_ifp->igmp_join_list, node,
                                               nextnode, ij)) {
                                /* Close socket and reopen with Source and Group
                                 */
@@@ -581,10 -583,10 +583,10 @@@
                }
        } /* igmp */
        else {
 -              struct igmp_sock *igmp;
 +              struct gm_sock *igmp;
  
                /* lookup IGMP socket */
-               igmp = pim_igmp_sock_lookup_ifaddr(pim_ifp->socket_list,
+               igmp = pim_igmp_sock_lookup_ifaddr(pim_ifp->igmp_socket_list,
                                                   ifaddr);
                if (ifc->address->family == AF_INET) {
                        if (igmp)

diff --cc pimd/pim_igmp.c
index 5b201c8586f39e926bcf48999a8f1f2ef4ab391f,df773f38d0e2aeb58f0ec8ac58f3e68251bd57b8..49ec804df5cd14dd33461e85db1a12f979e5e1f5
--- 1/pimd/pim_igmp.c
--- 2/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@@ -786,10 -787,10 +787,10 @@@ void igmp_startup_mode_on(struct gm_soc
        /*
          Since we're (re)starting, reset QQI to default Query Interval
        */
-       igmp->querier_query_interval = pim_ifp->default_query_interval;
+       igmp->querier_query_interval = pim_ifp->igmp_default_query_interval;
  }
  
 -static void igmp_group_free(struct igmp_group *group)
 +static void igmp_group_free(struct gm_group *group)
  {
        list_delete(&group->group_source_list);
  
@@@ -932,9 -933,9 +933,9 @@@ void pim_igmp_if_init(struct pim_interf
  void pim_igmp_if_reset(struct pim_interface *pim_ifp)
  {
        struct listnode *grp_node, *grp_nextnode;
 -      struct igmp_group *grp;
 +      struct gm_group *grp;
  
-       for (ALL_LIST_ELEMENTS(pim_ifp->group_list, grp_node, grp_nextnode,
+       for (ALL_LIST_ELEMENTS(pim_ifp->igmp_group_list, grp_node, grp_nextnode,
                               grp)) {
                igmp_group_delete(grp);
        }
@@@ -944,20 -945,20 +945,20 @@@ void pim_igmp_if_fini(struct pim_interf
  {
        pim_igmp_if_reset(pim_ifp);
  
-       assert(pim_ifp->group_list);
-       assert(!listcount(pim_ifp->group_list));
+       assert(pim_ifp->igmp_group_list);
+       assert(!listcount(pim_ifp->igmp_group_list));
  
-       list_delete(&pim_ifp->group_list);
-       hash_free(pim_ifp->group_hash);
+       list_delete(&pim_ifp->igmp_group_list);
+       hash_free(pim_ifp->igmp_group_hash);
  
-       list_delete(&pim_ifp->socket_list);
+       list_delete(&pim_ifp->igmp_socket_list);
  }
  
 -static struct igmp_sock *igmp_sock_new(int fd, struct in_addr ifaddr,
 -                                     struct interface *ifp, int mtrace_only)
 +static struct gm_sock *igmp_sock_new(int fd, struct in_addr ifaddr,
 +                                   struct interface *ifp, int mtrace_only)
  {
        struct pim_interface *pim_ifp;
 -      struct igmp_sock *igmp;
 +      struct gm_sock *igmp;
  
        pim_ifp = ifp->info;
  
@@@ -1187,13 -1189,13 +1188,13 @@@ struct gm_group *find_group_by_addr(str
  
        lookup.group_addr.s_addr = group_addr.s_addr;
  
-       return hash_lookup(pim_ifp->group_hash, &lookup);
+       return hash_lookup(pim_ifp->igmp_group_hash, &lookup);
  }
  
 -struct igmp_group *igmp_add_group_by_addr(struct igmp_sock *igmp,
 -                                        struct in_addr group_addr)
 +struct gm_group *igmp_add_group_by_addr(struct gm_sock *igmp,
 +                                      struct in_addr group_addr)
  {
 -      struct igmp_group *group;
 +      struct gm_group *group;
        struct pim_interface *pim_ifp = igmp->interface->info;
  
        group = find_group_by_addr(igmp, group_addr);

diff --cc pimd/pim_igmpv3.c
index 0dd6d0a351d918a9c146c58aaa76f64a9cbf3a4b,13db11fa80486b3327a1df0b25bb452e1b60d5ee..614213bfa526a0d6c08e557bfcd1a65016e544ed
--- 1/pimd/pim_igmpv3.c
--- 2/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@@ -70,10 -70,10 +70,10 @@@ static inline long igmp_gmi_msec(struc
                qqi = MAX(qqi, igmp->querier_query_interval);
        }
        return PIM_IGMP_GMI_MSEC(qrv, qqi,
-                                pim_ifp->query_max_response_time_dsec);
+                                pim_ifp->igmp_query_max_response_time_dsec);
  }
  
 -void igmp_group_reset_gmi(struct igmp_group *group)
 +void igmp_group_reset_gmi(struct gm_group *group)
  {
        long group_membership_interval_msec;
        struct interface *ifp;
@@@ -981,16 -982,17 +981,17 @@@ static void igmp_send_query_group(struc
  {
        struct interface *ifp = group->interface;
        struct pim_interface *pim_ifp = ifp->info;
 -      struct igmp_sock *igmp;
 +      struct gm_sock *igmp;
        struct listnode *sock_node;
  
-       for (ALL_LIST_ELEMENTS_RO(pim_ifp->socket_list, sock_node, igmp)) {
-               igmp_send_query(pim_ifp->version, group, igmp->fd, ifp->name,
-                               query_buf, query_buf_size, num_sources,
-                               group->group_addr, group->group_addr,
-                               pim_ifp->specific_query_max_response_time_dsec,
-                               s_flag, igmp->querier_robustness_variable,
-                               igmp->querier_query_interval);
+       for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
+               igmp_send_query(
+                       pim_ifp->igmp_version, group, igmp->fd, ifp->name,
+                       query_buf, query_buf_size, num_sources,
+                       group->group_addr, group->group_addr,
+                       pim_ifp->igmp_specific_query_max_response_time_dsec,
+                       s_flag, igmp->querier_robustness_variable,
+                       igmp->querier_query_interval);
        }
  }
  

diff --cc pimd/pim_mroute.c
Simple merge

diff --cc pimd/pim_nb_config.c
index 796a15398910c0810c26e9d6a01598193d028975,445c265e2c7897db3ded493a602cd8dea69b8750..9b79646dafba751e954d773d2f4e2b14dea6c53c
--- 1/pimd/pim_nb_config.c
--- 2/pimd/pim_nb_config.c
+++ b/pimd/pim_nb_config.c
@@@ -86,9 -86,9 +86,9 @@@ static void pim_if_membership_refresh(s
         */
  
        /* scan igmp groups */
-       for (ALL_LIST_ELEMENTS_RO(pim_ifp->group_list, grpnode, grp)) {
+       for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_group_list, grpnode, grp)) {
                struct listnode *srcnode;
 -              struct igmp_source *src;
 +              struct gm_source *src;
  
                /* scan group sources */
                for (ALL_LIST_ELEMENTS_RO(grp->group_source_list, srcnode,
@@@ -428,11 -428,11 +428,11 @@@ static void change_query_interval(struc
                int query_interval)
  {
        struct listnode *sock_node;
 -      struct igmp_sock *igmp;
 +      struct gm_sock *igmp;
  
-       pim_ifp->default_query_interval = query_interval;
+       pim_ifp->igmp_default_query_interval = query_interval;
  
-       for (ALL_LIST_ELEMENTS_RO(pim_ifp->socket_list, sock_node, igmp)) {
+       for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_socket_list, sock_node, igmp)) {
                igmp_sock_query_interval_reconfig(igmp);
                igmp_sock_query_reschedule(igmp);
        }
@@@ -442,11 -442,11 +442,11 @@@ static void change_query_max_response_t
                int query_max_response_time_dsec)
  {
        struct listnode *sock_node;
 -      struct igmp_sock *igmp;
 +      struct gm_sock *igmp;
        struct listnode *grp_node;
 -      struct igmp_group *grp;
 +      struct gm_group *grp;
  
-       if (pim_ifp->query_max_response_time_dsec
+       if (pim_ifp->igmp_query_max_response_time_dsec
            == query_max_response_time_dsec)
                return;
  
@@@ -465,9 -466,9 +466,9 @@@
        }
  
        /* scan socket groups */
-       for (ALL_LIST_ELEMENTS_RO(pim_ifp->group_list, grp_node, grp)) {
+       for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_group_list, grp_node, grp)) {
                struct listnode *src_node;
 -              struct igmp_source *src;
 +              struct gm_source *src;
  
                /* reset group timers for groups in EXCLUDE mode */
                if (grp->group_filtermode_isexcl)

diff --cc pimd/pim_vty.c
index 0cee70e85f5804e9a100cccfa7e703d53f999b42,e4dec9ee8eef311a52be02ff58a92179b55872e8..5c6d32714f0f5e1eed498d95df3a1f760d3e82c8
--- 1/pimd/pim_vty.c
--- 2/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@@ -401,12 -402,12 +402,12 @@@ int pim_interface_config_write(struct v
                                }
  
                                /* IF ip igmp join */
-                               if (pim_ifp->join_list) {
+                               if (pim_ifp->igmp_join_list) {
                                        struct listnode *node;
 -                                      struct igmp_join *ij;
 +                                      struct gm_join *ij;
                                        for (ALL_LIST_ELEMENTS_RO(
-                                                    pim_ifp->join_list, node,
-                                                    ij)) {
+                                                    pim_ifp->igmp_join_list,
+                                                    node, ij)) {
                                                char group_str[INET_ADDRSTRLEN];
                                                char source_str
                                                        [INET_ADDRSTRLEN];

diff --cc pimd/pim_zebra.c
index facc6198e8af02fa0ddce42a93110cd8113603a4,3a08c6aee5b2e3945a442aead6c7d91172ceee53..5708c35751f9f4b5198adadff79e742a31e95700
--- 1/pimd/pim_zebra.c
--- 2/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@@ -554,9 -554,10 +554,10 @@@ void igmp_source_forward_reevaluate_all
                        continue;
  
                /* scan igmp groups */
-               for (ALL_LIST_ELEMENTS_RO(pim_ifp->group_list, grpnode, grp)) {
+               for (ALL_LIST_ELEMENTS_RO(pim_ifp->igmp_group_list, grpnode,
+                                         grp)) {
                        struct listnode *srcnode;
 -                      struct igmp_source *src;
 +                      struct gm_source *src;
  
                        /* scan group sources */
                        for (ALL_LIST_ELEMENTS_RO(grp->group_source_list,