vlan-mon with both pppoe and ipoe

[1223421]

if vlan-mon enabled with both pppoe and ipoe, vlan work only on pppoe or ipoe(whichever runs first).

This patch "fixed" it, but it bad code, and it broke "vlan-timeout"

diff --git a/accel-pppd/ctrl/ipoe/ipoe.c b/accel-pppd/ctrl/ipoe/ipoe.c
index b6ca46c..8f1faa1 100644
--- a/accel-pppd/ctrl/ipoe/ipoe.c
+++ b/accel-pppd/ctrl/ipoe/ipoe.c
@@ -2619,7 +2619,7 @@ static void ipoe_serv_release(struct ipoe_serv *serv)
 
 	if (serv->vlan_mon) {
 		log_info2("ipoe: remove vlan %s\n", serv->ifname);
-		iplink_vlan_del(serv->ifindex);
+		//iplink_vlan_del(serv->ifindex);
 		vlan_mon_add_vid(serv->parent_ifindex, ETH_P_IP, serv->vid);
 	}
 
@@ -2841,8 +2841,7 @@ void ipoe_vlan_mon_notify(int ifindex, int vid, int vlan_ifindex)
 	} else {
 		log_info2("ipoe: create vlan %s parent %s\n", ifname, ifr.ifr_name);
 
-		if (iplink_vlan_add(ifname, ifindex, vid))
-			return;
+		iplink_vlan_add(ifname, ifindex, vid);
 	}
 
 	len = strlen(ifname);
@@ -2890,7 +2889,7 @@ void ipoe_vlan_mon_notify(int ifindex, int vid, int vlan_ifindex)
 	}
 
 	log_warn("ipoe: vlan %s not started\n", ifname);
-	iplink_vlan_del(ifr.ifr_ifindex);
+	//iplink_vlan_del(ifr.ifr_ifindex);
 	vlan_mon_del_vid(ifindex, ETH_P_IP, vid);
 }
 
diff --git a/accel-pppd/ctrl/pppoe/pppoe.c b/accel-pppd/ctrl/pppoe/pppoe.c
index 43163f1..df87e74 100644
--- a/accel-pppd/ctrl/pppoe/pppoe.c
+++ b/accel-pppd/ctrl/pppoe/pppoe.c
@@ -1602,7 +1602,7 @@ void pppoe_server_free(struct pppoe_serv_t *serv)
 
 	if (serv->vlan_mon) {
 		log_info2("pppoe: remove vlan %s\n", serv->ifname);
-		iplink_vlan_del(serv->ifindex);
+//		iplink_vlan_del(serv->ifindex);
 		vlan_mon_add_vid(serv->parent_ifindex, ETH_P_PPP_DISC, serv->vid);
 	}
 
@@ -1738,8 +1738,7 @@ void pppoe_vlan_mon_notify(int ifindex, int vid, int vlan_ifindex)
 	} else {
 		log_info2("pppoe: create vlan %s parent %s\n", ifname, ifr.ifr_name);
 
-		if (iplink_vlan_add(ifname, ifindex, vid))
-			return;
+		iplink_vlan_add(ifname, ifindex, vid);
 	}
 
 	len = strlen(ifname);
@@ -1787,7 +1786,7 @@ void pppoe_vlan_mon_notify(int ifindex, int vid, int vlan_ifindex)
 	}
 
 	log_warn("pppoe: vlan %s not started\n", ifname);
-	iplink_vlan_del(ifr.ifr_ifindex);
+	//iplink_vlan_del(ifr.ifr_ifindex);
 	vlan_mon_del_vid(ifindex, ETH_P_PPP_DISC, vid);
 }
 
diff --git a/accel-pppd/vlan-mon/vlan_mon.c b/accel-pppd/vlan-mon/vlan_mon.c
index f2109ed..84f1e71 100644
--- a/accel-pppd/vlan-mon/vlan_mon.c
+++ b/accel-pppd/vlan-mon/vlan_mon.c
@@ -322,8 +322,11 @@ static void vlan_mon_handler(const struct sockaddr_nl *addr, struct nlmsghdr *h)
 		else
 			proto = 0;
 
-		if (cb[proto])
-			cb[proto](ifindex, vid, vlan_ifindex);
+		if (cb[1])
+			cb[1](ifindex, vid, vlan_ifindex);
+		if (cb[0])
+			cb[0](ifindex, vid, vlan_ifindex);
+
 	}
 }

[micron10]

this is good idea.
@DmitriyEshenko please check this , only may be need to add options to check for pppoe or ipoe packate and if not receive to remove vlan , this will fix timeout and will allow user to use ipoe and pppoe on same interface with vlan_mon