Adjust to the pfkey changes in bgpd.

OK tb@

diff --git a/usr.sbin/bgpctl/output.c b/usr.sbin/bgpctl/output.c
index de0e56f..13b9025 100644 (file)
--- a/usr.sbin/bgpctl/output.c
+++ b/usr.sbin/bgpctl/output.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: output.c,v 1.54 2024/08/20 12:00:20 claudio Exp $ */
+/*     $OpenBSD: output.c,v 1.55 2024/10/01 11:50:15 claudio Exp $ */
 
 /*
  * Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -302,7 +302,7 @@ show_neighbor_full(struct peer *p, struct parse_result *res)
                ina.s_addr = htonl(p->remote_bgpid);
                printf("  BGP version 4, remote router-id %s",
                    inet_ntoa(ina));
-               printf("%s\n", fmt_auth_method(p->auth.method));
+               printf("%s\n", fmt_auth_method(p->auth_state.method));
        }
        printf("  BGP state = %s", statenames[p->state]);
        if (p->conf.down) {

diff --git a/usr.sbin/bgpctl/output_json.c b/usr.sbin/bgpctl/output_json.c
index 8a2e26c..27d400e 100644 (file)
--- a/usr.sbin/bgpctl/output_json.c
+++ b/usr.sbin/bgpctl/output_json.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: output_json.c,v 1.46 2024/08/14 19:10:51 claudio Exp $ */
+/*     $OpenBSD: output_json.c,v 1.47 2024/10/01 11:50:15 claudio Exp $ */
 
 /*
  * Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>
@@ -240,9 +240,9 @@ json_neighbor_full(struct peer *p)
                        json_do_uint("max_out_prefix_restart",
                            p->conf.max_out_prefix_restart);
        }
-       if (p->auth.method != AUTH_NONE)
+       if (p->auth_state.method != AUTH_NONE)
                json_do_string("authentication",
-                   fmt_auth_method(p->auth.method));
+                   fmt_auth_method(p->auth_state.method));
        json_do_bool("ttl_security", p->conf.ttlsec);
        json_do_uint("holdtime", p->conf.holdtime);
        json_do_uint("min_holdtime", p->conf.min_holdtime);