adjust priorities for agent address selection

sflow · Nov 21, 2022 · 458295b · 458295b
1 parent 7f233a1
commit 458295b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/hsflowd.spec b/hsflowd.spec
@@ -1,7 +1,7 @@
 Summary: host sFlow daemon
 Name: hsflowd
 Version: 2.0.39
-Release: 8
+Release: 9
 License: http://sflow.net/license.html
 Group: Applications/Internet
 URL: http://sflow.net

diff --git a/src/Linux/hsflowconfig.c b/src/Linux/hsflowconfig.c
@@ -1018,6 +1018,9 @@ extern "C" {
       else if(SFLAddress_isClassE(addr)) {
 	ipPriority = IPSP_CLASS_E;
       }
+      else if(SFLAddress_isMulticast(addr)) {
+	ipPriority = IPSP_MULTICAST;
+      }
       break;
 
     case SFLADDRESSTYPE_IP_V6:
@@ -1038,6 +1041,9 @@ extern "C" {
       else if(vlan != HSP_VLAN_ALL) {
 	ipPriority = IPSP_VLAN6;
       }
+      else if(SFLAddress_isMulticast(addr)) {
+	ipPriority = IPSP_MULTICAST;
+      }
       break;
     default:
       // not a v4 or v6 ip address at all

diff --git a/src/Linux/hsflowd.h b/src/Linux/hsflowd.h
@@ -252,6 +252,8 @@ extern "C" {
   } HSPVMState;
 
   typedef enum { IPSP_NONE=0,
+		 IPSP_CLASS_E,
+		 IPSP_MULTICAST,
 		 IPSP_LOOPBACK6,
 		 IPSP_LOOPBACK4,
 		 IPSP_SELFASSIGNED4,
@@ -262,8 +264,6 @@ extern "C" {
 		 IPSP_IP6_SCOPE_GLOBAL,
 		 IPSP_IP4_RFC1918,
 		 IPSP_IP4,
-		 IPSP_CLASS_E,
-		 IPSP_MULTICAST,
 		 IPSP_NUM_PRIORITIES,
   } EnumIPSelectionPriority;