Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 14 Apr 2020 19:04:21 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r531713 - in branches/2020Q2/net/ntopng: . files
Message-ID:  <202004141904.03EJ4Ljd020182@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Tue Apr 14 19:04:21 2020
New Revision: 531713
URL: https://svnweb.freebsd.org/changeset/ports/531713

Log:
  MFH: r531641
  
  Add patch replacing lua_tonumber() with lua_tointeger() inside
  htons() calls.
  
  Tese were causing build to fail on armv7, and it's more correct anyway.
  
  Submitted by:	garga (via email)
  
  Approved by:	ports-secteam (joneum)

Added:
  branches/2020Q2/net/ntopng/files/patch-src_ParsedFlow.cpp
     - copied unchanged from r531641, head/net/ntopng/files/patch-src_ParsedFlow.cpp
Modified:
  branches/2020Q2/net/ntopng/Makefile
Directory Properties:
  branches/2020Q2/   (props changed)

Modified: branches/2020Q2/net/ntopng/Makefile
==============================================================================
--- branches/2020Q2/net/ntopng/Makefile	Tue Apr 14 18:15:55 2020	(r531712)
+++ branches/2020Q2/net/ntopng/Makefile	Tue Apr 14 19:04:21 2020	(r531713)
@@ -3,6 +3,7 @@
 
 PORTNAME=	ntopng
 PORTVERSION=	4.0.d20200326
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net
 

Copied: branches/2020Q2/net/ntopng/files/patch-src_ParsedFlow.cpp (from r531641, head/net/ntopng/files/patch-src_ParsedFlow.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q2/net/ntopng/files/patch-src_ParsedFlow.cpp	Tue Apr 14 19:04:21 2020	(r531713, copy of r531641, head/net/ntopng/files/patch-src_ParsedFlow.cpp)
@@ -0,0 +1,25 @@
+--- src/ParsedFlow.cpp.orig	2020-03-26 13:52:23 UTC
++++ src/ParsedFlow.cpp
+@@ -127,17 +127,17 @@ void ParsedFlow::fromLua(lua_State *L, int index) {
+ 	if(!strcmp(key, "vlan_id"))
+ 	  vlan_id = lua_tonumber(L, -1);
+ 	else if(!strcmp(key, "version"))
+-	  version = htons(lua_tonumber(L, -1));
++	  version = htons(lua_tointeger(L, -1));
+ 	else if(!strcmp(key, "src_port"))
+-	  src_port = htons(lua_tonumber(L, -1));
++	  src_port = htons(lua_tointeger(L, -1));
+ 	else if(!strcmp(key, "dst_port"))
+-	  dst_port = htons(lua_tonumber(L, -1));
++	  dst_port = htons(lua_tointeger(L, -1));
+ 	else if(!strcmp(key, "l4_proto"))
+ 	  l4_proto = lua_tonumber(L, -1);
+ 	else if(!strcmp(key, "tcp_flags"))
+-	  tcp.tcp_flags = htons(lua_tonumber(L, -1));
++	  tcp.tcp_flags = htons(lua_tointeger(L, -1));
+ 	else if(!strcmp(key, "direction"))
+-	  direction = htons(lua_tonumber(L, -1));
++	  direction = htons(lua_tointeger(L, -1));
+ 	else if(!strcmp(key, "first_switched"))
+ 	  first_switched = lua_tonumber(L, -1);
+ 	else if(!strcmp(key, "last_switched"))



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004141904.03EJ4Ljd020182>