Attachment #195057 for bug #217152

Lines 4-10 Link Here

(-)Makefile (-1 / +1 lines)
4	PORTNAME= xorp	4	PORTNAME= xorp
5	PORTVERSION= 1.8.5	5	PORTVERSION= 1.8.5
6	DISTVERSIONPREFIX= ${PORTNAME}-	6	DISTVERSIONPREFIX= ${PORTNAME}-
7	PORTREVISION= 8	7	PORTREVISION= 9
8	CATEGORIES= net	8	CATEGORIES= net
9		9
10	MAINTAINER= hrs@FreeBSD.org	10	MAINTAINER= hrs@FreeBSD.org

Lines 1-4 Link Here

(-)files/patch-SConstruct (-3 / +16 lines)
1	--- SConstruct.orig 2012-01-11 17:56:10 UTC	1	--- SConstruct.orig 2018-07-11 16:37:51 UTC
2	+++ SConstruct	2	+++ SConstruct
3	@@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0):	3	@@ -162,22 +162,13 @@ if (len(COMMAND_LINE_TARGETS) == 0):
4		4
Lines 25-32 Link Here
25	variables = vars)	25	variables = vars)
26		26
27	prefix = env['prefix']	27	prefix = env['prefix']
28	@@ -880,6 +871,7 @@ env.AppendUnique(CFLAGS = [	28	@@ -877,9 +868,9 @@ env.AppendUnique(CFLAGS = [
29	'-Wcast-align',	29	'-Wcast-qual',
		30	'-Wmissing-declarations',
		31	'-Wpointer-arith',
		32	- '-Wcast-align',
30	'-Wstrict-prototypes',	33	'-Wstrict-prototypes',
31	'-Wnested-externs',	34	'-Wnested-externs',
32	+ '-Wno-unused-function',	35	+ '-Wno-unused-function',
Lines 33-35 Link Here
33	'-pipe',	36	'-pipe',
34	])	37	])
35		38
		39	@@ -889,9 +880,7 @@ env.AppendUnique(CXXFLAGS = [
		40	'-Wwrite-strings',
		41	'-Wcast-qual',
		42	'-Wpointer-arith',
		43	- '-Wcast-align',
		44	'-Woverloaded-virtual',
		45	- '-ftemplate-depth-25',
		46	'-pipe',
		47	])
		48




--- fea/data_plane/io/io_ip_socket.cc.orig	2018-07-10 15:49:50 UTC
+++ fea/data_plane/io/io_ip_socket.cc
@@ -2293,10 +2293,10 @@ IoIpSocket::send_packet(const string& if
 	    //
 	    struct sockaddr_in sin;
 	    src_address.copy_out(sin);
-	    if (bind(_proto_socket_out,
+	    bind(_proto_socket_out,
 		     reinterpret_cast<struct sockaddr*>(&sin),
-		     sizeof(sin))
-		< 0) {
+		     sizeof(sin));
+		if ( reinterpret_cast<struct sockaddr*>(&sin) < ((void*)0)) {
 		error_msg = c_format("raw socket bind(%s) failed: %s",
 				     cstring(src_address), XSTRERROR);
 		XLOG_ERROR("%s", error_msg.c_str());




--- policy/backend/lex.yy_policy_backend_parser.cc.orig	2018-07-10 15:46:56 UTC
+++ policy/backend/lex.yy_policy_backend_parser.cc
@@ -728,9 +728,9 @@ extern int yy_policy_backend_parserlex (
  */
 YY_DECL
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp, *yy_bp;
-	register int yy_act;
+	yy_state_type yy_current_state;
+	char *yy_cp, *yy_bp;
+	int yy_act;
     
 #line 40 "backend.l"
 
@@ -779,7 +779,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -1171,9 +1171,9 @@ case YY_STATE_EOF(STR):
  */
 static int yy_get_next_buffer (void)
 {
-    	register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
-	register char *source = (yytext_ptr);
-	register int number_to_move, i;
+    	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
+	char *source = (yytext_ptr);
+	int number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1297,14 +1297,14 @@ static int yy_get_next_buffer (void)
 
     static yy_state_type yy_get_previous_state (void)
 {
-	register yy_state_type yy_current_state;
-	register char *yy_cp;
+	yy_state_type yy_current_state;
+	char *yy_cp;
     
 	yy_current_state = (yy_start);
 
 	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
 		{
-		register YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
+		YY_CHAR yy_c = (*yy_cp ? yy_ec[YY_SC_TO_UI(*yy_cp)] : 1);
 		if ( yy_accept[yy_current_state] )
 			{
 			(yy_last_accepting_state) = yy_current_state;
@@ -1329,10 +1329,10 @@ static int yy_get_next_buffer (void)
  */
     static yy_state_type yy_try_NUL_trans  (yy_state_type yy_current_state )
 {
-	register int yy_is_jam;
-    	register char *yy_cp = (yy_c_buf_p);
+	int yy_is_jam;
+    	char *yy_cp = (yy_c_buf_p);
 
-	register YY_CHAR yy_c = 1;
+	YY_CHAR yy_c = 1;
 	if ( yy_accept[yy_current_state] )
 		{
 		(yy_last_accepting_state) = yy_current_state;
@@ -1933,7 +1933,7 @@ int yy_policy_backend_parserlex_destroy 
 #ifndef yytext_ptr
 static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 {
-	register int i;
+	int i;
 	for ( i = 0; i < n; ++i )
 		s1[i] = s2[i];
 }
@@ -1942,7 +1942,7 @@ static void yy_flex_strncpy (char* s1, y
 #ifdef YY_NEED_STRLEN
 static int yy_flex_strlen (yyconst char * s )
 {
-	register int n;
+	int n;
 	for ( n = 0; s[n]; ++n )
 		;
 




--- libproto/packet.cc.orig	2018-07-10 12:55:07 UTC
+++ libproto/packet.cc
@@ -88,8 +88,8 @@ IpHeader4::fragment(size_t mtu, list<vec
     //
     memcpy(&frag_buf[0], _data, IpHeader4::SIZE);
     {
-	register const u_char *cp;
-	register u_char *dp;
+	const u_char *cp;
+	u_char *dp;
 	int opt, optlen, cnt;
 
 	cp = (const u_char *)(orig_ip4.data() + orig_ip4.size());
@@ -233,7 +233,7 @@ IpHeader4Writer::compute_checksum()
 }
 




--- cli/libtecla/pathutil.c.orig	2018-07-10 13:09:21 UTC
+++ cli/libtecla/pathutil.c
@@ -168,7 +168,7 @@ char *_pn_append_to_path(PathName *path,
 /*
  * How many characters should be appended?
  */
-  if(slen < 0 || slen > strlen(string))
+  if(slen < 0 || (unsigned long)(slen) > strlen(string))
     slen = strlen(string);
 /*
  * Resize the pathname if needed.
@@ -239,7 +239,7 @@ char *_pn_prepend_to_path(PathName *path
 /*
  * How many characters should be appended?
  */
-  if(slen < 0 || slen > strlen(string))
+  if(slen < 0 || (unsigned long)(slen) > strlen(string))
     slen = strlen(string);
 /*
  * Work out how far we need to shift the original path string to make
@@ -494,7 +494,7 @@ char *_pu_start_of_path(const char *stri
 	break;
     };
   };
-  return (char *)string + i + 1;
+  return (char *)(string + i + 1);
 }
 
 /*.......................................................................
@@ -534,7 +534,7 @@ char *_pu_end_of_path(const char *string
       escaped = 1;
     };
   };
-  return (char *)string + i;
+  return (char *)(string + i);
 }
 
 /*.......................................................................

Return to bug 217152

Line 0 Link Here

(-)files/patch-io__ip__socket.cc (+16 lines)
	1	--- fea/data_plane/io/io_ip_socket.cc.orig 2018-07-10 15:49:50 UTC
	2	+++ fea/data_plane/io/io_ip_socket.cc
	3	@@ -2293,10 +2293,10 @@ IoIpSocket::send_packet(const string& if
	4	//
	5	struct sockaddr_in sin;
	6	src_address.copy_out(sin);
	7	- if (bind(_proto_socket_out,
	8	+ bind(_proto_socket_out,
	9	reinterpret_cast<struct sockaddr*>(&sin),
	10	- sizeof(sin))
	11	- < 0) {
	12	+ sizeof(sin));
	13	+ if ( reinterpret_cast<struct sockaddr>(&sin) < ((void)0)) {
	14	error_msg = c_format("raw socket bind(%s) failed: %s",
	15	cstring(src_address), XSTRERROR);
	16	XLOG_ERROR("%s", error_msg.c_str());

Line 0 Link Here

(-)files/patch-lex.yy__policy__backend__parser.cc (+87 lines)
		1	--- policy/backend/lex.yy_policy_backend_parser.cc.orig 2018-07-10 15:46:56 UTC
		2	+++ policy/backend/lex.yy_policy_backend_parser.cc
		3	@@ -728,9 +728,9 @@ extern int yy_policy_backend_parserlex (
		4	*/
		5	YY_DECL
		6	{
		7	- register yy_state_type yy_current_state;
		8	- register char yy_cp, yy_bp;
		9	- register int yy_act;
		10	+ yy_state_type yy_current_state;
		11	+ char yy_cp, yy_bp;
		12	+ int yy_act;
		13
		14	#line 40 "backend.l"
		15
		16	@@ -779,7 +779,7 @@ YY_DECL
		17	yy_match:
		18	do
		19	{
		20	- register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
		21	+ YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
		22	if ( yy_accept[yy_current_state] )
		23	{
		24	(yy_last_accepting_state) = yy_current_state;
		25	@@ -1171,9 +1171,9 @@ case YY_STATE_EOF(STR):
		26	*/
		27	static int yy_get_next_buffer (void)
		28	{
		29	- register char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
		30	- register char *source = (yytext_ptr);
		31	- register int number_to_move, i;
		32	+ char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
		33	+ char *source = (yytext_ptr);
		34	+ int number_to_move, i;
		35	int ret_val;
		36
		37	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
		38	@@ -1297,14 +1297,14 @@ static int yy_get_next_buffer (void)
		39
		40	static yy_state_type yy_get_previous_state (void)
		41	{
		42	- register yy_state_type yy_current_state;
		43	- register char *yy_cp;
		44	+ yy_state_type yy_current_state;
		45	+ char *yy_cp;
		46
		47	yy_current_state = (yy_start);
		48
		49	for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp )
		50	{
		51	- register YY_CHAR yy_c = (yy_cp ? yy_ec[YY_SC_TO_UI(yy_cp)] : 1);
		52	+ YY_CHAR yy_c = (yy_cp ? yy_ec[YY_SC_TO_UI(yy_cp)] : 1);
		53	if ( yy_accept[yy_current_state] )
		54	{
		55	(yy_last_accepting_state) = yy_current_state;
		56	@@ -1329,10 +1329,10 @@ static int yy_get_next_buffer (void)
		57	*/
		58	static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state )
		59	{
		60	- register int yy_is_jam;
		61	- register char *yy_cp = (yy_c_buf_p);
		62	+ int yy_is_jam;
		63	+ char *yy_cp = (yy_c_buf_p);
		64
65	- register YY_CHAR yy_c = 1;
66	+ YY_CHAR yy_c = 1;
67	if ( yy_accept[yy_current_state] )
68	{
69	(yy_last_accepting_state) = yy_current_state;
70	@@ -1933,7 +1933,7 @@ int yy_policy_backend_parserlex_destroy
71	#ifndef yytext_ptr
72	static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
73	{
74	- register int i;
75	+ int i;
76	for ( i = 0; i < n; ++i )
77	s1[i] = s2[i];
78	}
79	@@ -1942,7 +1942,7 @@ static void yy_flex_strncpy (char* s1, y
80	#ifdef YY_NEED_STRLEN
81	static int yy_flex_strlen (yyconst char * s )
82	{
83	- register int n;
84	+ int n;
85	for ( n = 0; s[n]; ++n )
86	;
87

Lines 1-5 Link Here

(-)files/patch-libproto__packet.cc (-1 / +12 lines)
1	--- libproto/packet.cc.orig 2012-01-11 17:56:10 UTC	1	--- libproto/packet.cc.orig 2018-07-10 12:55:07 UTC
2	+++ libproto/packet.cc	2	+++ libproto/packet.cc
		3	@@ -88,8 +88,8 @@ IpHeader4::fragment(size_t mtu, list<vec
		4	//
		5	memcpy(&frag_buf[0], _data, IpHeader4::SIZE);
		6	{
		7	- register const u_char *cp;
		8	- register u_char *dp;
		9	+ const u_char *cp;
		10	+ u_char *dp;
		11	int opt, optlen, cnt;
		12
		13	cp = (const u_char *)(orig_ip4.data() + orig_ip4.size());
3	@@ -233,7 +233,7 @@ IpHeader4Writer::compute_checksum()	14	@@ -233,7 +233,7 @@ IpHeader4Writer::compute_checksum()
4	}	15	}
5		16

Line 0 Link Here

(-)files/patch-pathutil.c (+38 lines)
	1	--- cli/libtecla/pathutil.c.orig 2018-07-10 13:09:21 UTC
	2	+++ cli/libtecla/pathutil.c
	3	@@ -168,7 +168,7 @@ char _pn_append_to_path(PathName path,
	4	/*
	5	* How many characters should be appended?
	6	*/
	7	- if(slen < 0 \|\| slen > strlen(string))
	8	+ if(slen < 0 \|\| (unsigned long)(slen) > strlen(string))
	9	slen = strlen(string);
	10	/*
	11	* Resize the pathname if needed.
	12	@@ -239,7 +239,7 @@ char _pn_prepend_to_path(PathName path
	13	/*
	14	* How many characters should be appended?
	15	*/
	16	- if(slen < 0 \|\| slen > strlen(string))
	17	+ if(slen < 0 \|\| (unsigned long)(slen) > strlen(string))
	18	slen = strlen(string);
	19	/*
	20	* Work out how far we need to shift the original path string to make
	21	@@ -494,7 +494,7 @@ char _pu_start_of_path(const char stri
	22	break;
	23	};
	24	};
	25	- return (char *)string + i + 1;
	26	+ return (char *)(string + i + 1);
	27	}
	28
	29	/*.......................................................................
	30	@@ -534,7 +534,7 @@ char _pu_end_of_path(const char string
	31	escaped = 1;
	32	};
	33	};
	34	- return (char *)string + i;
	35	+ return (char *)(string + i);
	36	}
	37
	38	/*.......................................................................