Introduced gateway into ipaddress

ntop · Oct 4, 2024 · e4632b3 · e4632b3
1 parent e31842e
commit e4632b3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/include/Host.h b/include/Host.h
@@ -762,6 +762,7 @@ class Host : public GenericHashEntry,
   void checkNameReset();
   void checkDataReset();
   void checkBroadcastDomain();
+  void checkGatewayInfo();
   bool hasAnomalies() const;
   void housekeep(time_t t); /* Virtual method, called in the datapath from
                                GenericHash::purgeIdle */

diff --git a/include/IpAddress.h b/include/IpAddress.h
@@ -29,7 +29,7 @@ struct ipAddress {
       multicastIP : 1, broadcastIP : 1, blacklistedIP : 1, localIP : 1;
 
   u_int8_t dnsServer : 1, dhcpServer : 1, smtpServer : 1, ntpServer : 1,
-      imapServer : 1, popServer : 1, unused : 2;
+      imapServer : 1, popServer : 1, gateway: 1, unused : 1;
   union {
     struct ndpi_in6_addr ipv6;
     u_int32_t ipv4; /* Host byte code */
@@ -132,7 +132,8 @@ class IpAddress {
   inline void setPopServer() { addr.popServer = true; }
   inline bool isNtpServer() const { return (addr.ntpServer); }
   inline void setNtpServer() { addr.ntpServer = true; }
-  inline bool isGateway() { return false; }
+  inline bool isGateway() const { return (addr.gateway); }
+  inline void setGateway(bool is_gateway) { addr.gateway = is_gateway; }
 
   char* print(char* str, u_int str_len, u_int8_t bitmask = 0xFF) const;
   char* printMask(char* str, u_int str_len, bool isLocalIP);

diff --git a/src/FlowAlertsLoader.cpp b/src/FlowAlertsLoader.cpp
@@ -81,8 +81,10 @@ FlowAlertsLoader::FlowAlertsLoader() {
                 LongLivedFlowAlert::getDefaultScore());
   registerAlert(LowGoodputFlowAlert::getClassType(),
                 LowGoodputFlowAlert::getDefaultScore());
+#if defined(HAVE_NEDGE)
   registerAlert(NedgeBlockedFlowAlert::getClassType(),
                 NedgeBlockedFlowAlert::getDefaultScore());
+#endif
   registerAlert(NotPurgedAlert::getClassType(),
                 NotPurgedAlert::getDefaultScore());
   registerAlert(RareDestinationAlert::getClassType(),

diff --git a/src/Host.cpp b/src/Host.cpp
@@ -1314,6 +1314,7 @@ void Host::periodic_stats_update(const struct timeval *tv) {
   checkDataReset();
   checkStatsReset();
   checkBroadcastDomain();
+  checkGatewayInfo();
 
   /* Update the pointer to the operating system according to what is specified
    * in cur_os_type, if necessary */
@@ -2001,6 +2002,13 @@ void Host::checkBroadcastDomain() {
 
 /* *************************************** */
 
+void Host::checkGatewayInfo() {
+  bool is_gateway = getDeviceType() == device_networking;
+  ip.setGateway(is_gateway);
+}
+
+/* *************************************** */
+
 void Host::freeHostNames() {
   if (ssdpLocation) {
     free(ssdpLocation);