wip: update illumos patch

eait-itig · Jul 17, 2024 · 21e2f6e · 21e2f6e
1 parent 3d9c7a6
commit 21e2f6e
Showing 1 changed file with 18 additions and 10 deletions.
diff --git a/patches/0006-illumos.patch → patches/0007-illumos.patch b/patches/0006-illumos.patch → patches/0007-illumos.patch
@@ -1,14 +1,19 @@
-commit 2eaf8bd1b73a48bf16baa386e409cfcd8614787a
-Author: Alex Wilson <alex@cooperi.net>
-Date:   Mon Jan 24 10:42:54 2022 +1000
+From 077630b3d3e21b69a686ded0213dd09820f9592f Mon Sep 17 00:00:00 2001
+From: Alex Wilson <alex@cooperi.net>
+Date: Mon, 24 Jan 2022 10:42:54 +1000
+Subject: [PATCH] xxx: illumos patches
 
-    xxx: illumos patches
+---
+ src/usr.sbin/bgpctl/bgpctl.c | 2 ++
+ src/usr.sbin/bgpd/control.c  | 2 ++
+ src/usr.sbin/bgpd/session.c  | 2 ++
+ 3 files changed, 6 insertions(+)
 
 diff --git a/src/usr.sbin/bgpctl/bgpctl.c b/src/usr.sbin/bgpctl/bgpctl.c
-index 724c185f..8d7c0bd3 100644
+index 1dd4c7a67..aff3d6352 100644
 --- src/usr.sbin/bgpctl/bgpctl.c
 +++ src/usr.sbin/bgpctl/bgpctl.c
-@@ -75,6 +75,8 @@ usage(void)
+@@ -77,6 +77,8 @@ usage(void)
  	exit(1);
  }
 
@@ -18,7 +23,7 @@ index 724c185f..8d7c0bd3 100644
  main(int argc, char *argv[])
  {
 diff --git a/src/usr.sbin/bgpd/control.c b/src/usr.sbin/bgpd/control.c
-index 844a05e5..7d11d030 100644
+index 49fd55ad1..4c9db8046 100644
 --- src/usr.sbin/bgpd/control.c
 +++ src/usr.sbin/bgpd/control.c
 @@ -39,6 +39,8 @@ int		 control_close(struct ctl_conn *);
@@ -31,22 +36,25 @@ index 844a05e5..7d11d030 100644
  control_check(char *path)
  {
 diff --git a/src/usr.sbin/bgpd/session.c b/src/usr.sbin/bgpd/session.c
-index 61224667..76c50390 100644
+index dd24eb29a..4d2003b69 100644
 --- src/usr.sbin/bgpd/session.c
 +++ src/usr.sbin/bgpd/session.c
-@@ -1141,6 +1141,7 @@ session_setup_socket(struct peer *p)
+@@ -1154,6 +1154,7 @@ session_setup_socket(struct peer *p)
  			 */
  			if (p->conf.ttlsec) {
  				ttl = 256 - p->conf.distance;
 +#if defined(IP_MINTTL)
  				if (setsockopt(p->fd, IPPROTO_IP, IP_MINTTL,
  				    &ttl, sizeof(ttl)) == -1) {
  					log_peer_warn(&p->conf,
-@@ -1148,6 +1149,7 @@ session_setup_socket(struct peer *p)
+@@ -1161,6 +1162,7 @@ session_setup_socket(struct peer *p)
  					    "setsockopt MINTTL");
  					return (-1);
  				}
 +#endif
  				ttl = 255;
  			}
 
+-- 
+2.45.2
+