some peers are following an expired draft RFC and are sending "unknown"

error codes to OPEN messages.  make them "known", and show them.

OK benno@, claudio@, sthen@

diff --git a/usr.sbin/bgpd/log.h b/usr.sbin/bgpd/log.h
index bd5a139..e70c98d 100644 (file)
--- a/usr.sbin/bgpd/log.h
+++ b/usr.sbin/bgpd/log.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: log.h,v 1.15 2013/03/07 21:26:28 claudio Exp $ */
+/*     $OpenBSD: log.h,v 1.16 2015/10/11 19:25:06 phessler Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -68,7 +68,9 @@ static const char * const suberr_open_names[] = {
        "optional parameter error",
        "authentication error",
        "unacceptable holdtime",
-       "unsupported capability"
+       "unsupported capability",
+       "group membership conflict",    /* draft-ietf-idr-bgp-multisession-07 */
+       "group membership required"     /* draft-ietf-idr-bgp-multisession-07 */
 };
 
 static const char * const suberr_fsm_names[] = {

diff --git a/usr.sbin/bgpd/session.h b/usr.sbin/bgpd/session.h
index 9aa7ca0..430dae0 100644 (file)
--- a/usr.sbin/bgpd/session.h
+++ b/usr.sbin/bgpd/session.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: session.h,v 1.119 2015/07/20 16:10:38 claudio Exp $ */
+/*     $OpenBSD: session.h,v 1.120 2015/10/11 19:25:06 phessler Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -86,7 +86,9 @@ enum suberr_open {
        ERR_OPEN_OPT,
        ERR_OPEN_AUTH,
        ERR_OPEN_HOLDTIME,
-       ERR_OPEN_CAPA
+       ERR_OPEN_CAPA,
+       ERR_OPEN_GROUP_CONFLICT,        /* draft-ietf-idr-bgp-multisession-07 */
+       ERR_OPEN_GROUP_REQUIRED         /* draft-ietf-idr-bgp-multisession-07 */
 };
 
 enum suberr_fsm {