Resolving the merge conflicts with orighin

Author: Praveen-Brcm

src/iccpd/include/mlacp_fsm.h

@@ -121,7 +121,6 @@ enum ICCP_DBG_CNTR_MSG
     ICCP_DBG_CNTR_MSG_STP_PO_PORT_MAP  = 26,
     ICCP_DBG_CNTR_MSG_STP_AGE_OUT      = 27,
     ICCP_DBG_CNTR_MSG_STP_COMMON_MSG   = 28,
-    ICCP_DBG_CNTR_MSG_LACP_FLBK        = 29, 
     ICCP_DBG_CNTR_MSG_MAX
 };
 typedef enum ICCP_DBG_CNTR_MSG ICCP_DBG_CNTR_MSG_e;

src/iccpd/include/mlacp_link_handler.h

@@ -74,7 +74,6 @@ int mlacp_link_del_iccp_info(int mlag_id);
 int mlacp_link_set_remote_if_state(int mlag_id, char *po_name, bool is_oper_up);
 int mlacp_link_del_remote_if_info(int mlag_id, char *po_name);
 int mlacp_link_set_peerlink_port_isolation(int mlag_id, char *po_name, bool is_isolation_enable);
-int mlacp_link_set_iccp_peer_system_id(int mlag_id, uint8_t *system_id);
 
 void mlacp_mlag_intf_detach_handler(struct CSM* csm, struct LocalInterface* local_if);
 void mlacp_peer_mlag_intf_delete_handler(struct CSM* csm, char *mlag_if_name);

src/iccpd/include/system.h

@@ -112,7 +112,7 @@ enum SYNCD_RX_DBG_CNTR_MSG_e
 {
     SYNCD_RX_DBG_CNTR_MSG_MAC = 0,
     SYNCD_RX_DBG_CNTR_MSG_CFG_MCLAG_DOMAIN = 1,
-    SYNCD_RX_DBG_CNTR_MSG_CFG_MCLAG_IFACE  = 2
+    SYNCD_RX_DBG_CNTR_MSG_CFG_MCLAG_IFACE  = 2,
     SYNCD_RX_DBG_CNTR_MSG_MAX
 };
 

src/iccpd/src/Makefile.am

@@ -17,6 +17,7 @@ iccpd_SOURCES = \
 	    mlacp_link_handler.c \
 	    mlacp_sync_prepare.c mlacp_sync_update.c\
 	    mlacp_fsm.c \
-	    iccp_netlink.c
+	    iccp_netlink.c \
+            openbsd_tree.c
 iccpd_CFLAGS = $(DBGFLAGS) $(AM_CFLAGS) $(CFLAGS_COMMON)
 iccpd_LDADD = -lnl-genl-3 -lnl-route-3 -lnl-3 -lpthread

src/iccpd/src/app_csm.c

@@ -239,7 +239,7 @@ int mlacp_bind_local_if(struct CSM* csm, struct LocalInterface* lif)
         if (lif_po->type == IF_T_PORT_CHANNEL && lif_po->po_id == lif->po_id)
         {
             /*if join a po member, may swss restart, reset portchannel ip mac  to mclagsyncd*/
-            update_if_ipmac_on_standby(lif_po);
+            update_if_ipmac_on_standby(lif_po, 1);
             return 0;
         }
     }

src/iccpd/src/iccp_ifm.c

@@ -471,6 +471,8 @@ static void do_ndisc_learn_from_kernel(struct ndmsg *ndm, struct rtattr *tb[], i
     return;
 }
 
+
+
 int parse_rtattr_flags(struct rtattr *tb[], int max, struct rtattr *rta, int len, unsigned short flags)
 {
     unsigned short type;
@@ -917,6 +919,7 @@ void do_ndisc_update_from_reply_packet(unsigned int ifindex, char *ipv6_addr, ui
 
     return;
 }
+
 void iccp_from_netlink_port_state_handler( char * ifname, int state)
 {
     struct CSM *csm = NULL;

src/iccpd/src/iccp_netlink.c

@@ -1768,7 +1768,6 @@ int iccp_system_init_netlink_socket()
     }
 #if 0
     sys->family = genl_ctrl_resolve(sys->genric_sock, TEAM_GENL_NAME);
-
     while (sys->family < 0)
     {
         sleep(1);

src/iccpd/src/mclagdctl/mclagdctl.c

@@ -827,7 +827,6 @@ int mclagdctl_parse_dump_dbg_counters(char *msg, int data_len)
     fprintf(stdout, "Link add/del: %u/%u\n",
         sys_counter_p->newlink_count, sys_counter_p->dellink_count);
     fprintf(stdout, "  Unknown if_name: %u\n", sys_counter_p->unknown_if_name_count);
-    fprintf(stdout, "  Not AF_BRIDGE: %u\n", sys_counter_p->not_afbridge_count);
     fprintf(stdout, "Neighbor(ARP) add/del: %u/%u\n",
         sys_counter_p->newnbr_count, sys_counter_p->delnbr_count);
     fprintf(stdout, "  MAC entry add/del: %u/%u\n",

src/iccpd/src/mclagdctl/mclagdctl.h

@@ -76,6 +76,7 @@ enum mclagdctl_notify_peer_type
     INFO_TYPE_DUMP_PEER_PORTLIST,
     INFO_TYPE_DUMP_DBG_COUNTERS,
     INFO_TYPE_CONFIG_LOGLEVEL,
+    INFO_TYPE_CONFIG_DOWN,
     INFO_TYPE_FINISH,
 };
 

src/iccpd/src/mlacp_fsm.c

@@ -304,6 +304,7 @@ static void mlacp_sync_send_syncMacInfo(struct CSM* csm)
     return;
 }
 
+
 static void mlacp_sync_send_syncArpInfo(struct CSM* csm)
 {
     int msg_len = 0;
@@ -761,7 +762,6 @@ void mlacp_init(struct CSM* csm, int all)
     MLACP_MSG_QUEUE_REINIT(MLACP(csm).mlacp_msg_list);
     MLACP_MSG_QUEUE_REINIT(MLACP(csm).arp_msg_list);
     MLACP_MSG_QUEUE_REINIT(MLACP(csm).ndisc_msg_list);
-    MLACP_MSG_QUEUE_REINIT(MLACP(csm).lacp_flbk_msg_list);
     mlacp_mac_msg_queue_reinit(csm);
 
     PIF_QUEUE_REINIT(MLACP(csm).pif_list);