From c5e9ec582e51dbda95fa4d6045b67958912616b7 Mon Sep 17 00:00:00 2001 From: Neil McKee Date: Wed, 5 Jun 2024 16:35:57 -0700 Subject: [PATCH] mod_sonic portGetAdaptor() revert to lookup by osIndex only --- hsflowd.spec | 2 +- src/Linux/mod_sonic.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hsflowd.spec b/hsflowd.spec index f86eb3c..764e6d1 100644 --- a/hsflowd.spec +++ b/hsflowd.spec @@ -1,7 +1,7 @@ Summary: host sFlow daemon Name: hsflowd Version: 2.1.04 -Release: 5 +Release: 6 License: http://sflow.net/license.html Group: Applications/Internet URL: http://sflow.net diff --git a/src/Linux/mod_sonic.c b/src/Linux/mod_sonic.c index 46c6c70..4aa8c35 100644 --- a/src/Linux/mod_sonic.c +++ b/src/Linux/mod_sonic.c @@ -270,13 +270,13 @@ extern "C" { static SFLAdaptor *portGetAdaptor(EVMod *mod, HSPSonicPort *prt) { HSP *sp = (HSP *)EVROOTDATA(mod); - //if(prt->osIndex == HSP_SONIC_IFINDEX_UNDEFINED) - // return NULL; + if(prt->osIndex == HSP_SONIC_IFINDEX_UNDEFINED) + return NULL; SFLAdaptor *adaptor = adaptorByIndex(sp, prt->osIndex); - if(adaptor == NULL) - adaptor = adaptorByName(sp, prt->portName); - if(adaptor == NULL) - adaptor = adaptorByAlias(sp, prt->portName); + //if(adaptor == NULL) + // adaptor = adaptorByName(sp, prt->portName); + //if(adaptor == NULL) + // adaptor = adaptorByAlias(sp, prt->portName); return adaptor; }