A few more s/2858/4760/ and use RFC <number> everywhere.

4 files changed, 14 insertions, 14 deletions

diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h
index cf5231ed25d..2393fed0a7d 100644
--- a/usr.sbin/bgpd/bgpd.h
+++ b/usr.sbin/bgpd/bgpd.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bgpd.h,v 1.213 2007/03/16 13:52:30 claudio Exp $ */
+/*	$OpenBSD: bgpd.h,v 1.214 2007/03/16 14:06:57 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -220,7 +220,7 @@ struct peer_auth {
 };
 
 struct capabilities {
-	u_int8_t	mp_v4;		/* multiprotocol extensions, RFC 2858 */
+	u_int8_t	mp_v4;		/* multiprotocol extensions, RFC 4760 */
 	u_int8_t	mp_v6;
 	u_int8_t	refresh;	/* route refresh, RFC 2918 */
 	u_int8_t	restart;	/* draft-ietf-idr-restart */
@@ -588,7 +588,7 @@ struct filter_peers {
 #define	COMMUNITY_NO_EXPORT		0xff01
 #define	COMMUNITY_NO_ADVERTISE		0xff02
 #define	COMMUNITY_NO_EXPSUBCONFED	0xff03
-#define	COMMUNITY_NO_PEER		0xff04	/* rfc3765 */
+#define	COMMUNITY_NO_PEER		0xff04	/* RFC 3765 */
 
 struct filter_prefix {
 	struct bgpd_addr	addr;
@@ -683,12 +683,12 @@ struct rde_memstats {
 	int64_t		attr_dcnt;
 };
 
-/* Address Family Numbers as per rfc1700 */
+/* Address Family Numbers as per RFC 1700 */
 #define	AFI_IPv4	1
 #define	AFI_IPv6	2
 #define	AFI_ALL		0xffff
 
-/* Subsequent Address Family Identifier as per rfc4760 */
+/* Subsequent Address Family Identifier as per RFC 4760 */
 #define	SAFI_NONE	0x00
 #define	SAFI_UNICAST	0x01
 #define	SAFI_MULTICAST	0x02
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index 8c9c858da77..783a6c25012 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde.c,v 1.221 2007/03/16 13:52:30 claudio Exp $ */
+/*	$OpenBSD: rde.c,v 1.222 2007/03/16 14:06:57 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -790,7 +790,7 @@ rde_update_dispatch(struct imsg *imsg)
 		if ((pos = rde_update_get_prefix(p, len, &prefix,
 		    &prefixlen)) == -1) {
 			/*
-			 * the rfc does not mention what we should do in
+			 * the RFC does not mention what we should do in
 			 * this case. Let's do the same as in the NLRI case.
 			 */
 			log_peer_warnx(&peer->conf, "bad withdraw prefix");
diff --git a/usr.sbin/bgpd/rde_update.c b/usr.sbin/bgpd/rde_update.c
index fd4bb304d09..a012702d93c 100644
--- a/usr.sbin/bgpd/rde_update.c
+++ b/usr.sbin/bgpd/rde_update.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rde_update.c,v 1.54 2007/03/16 13:52:30 claudio Exp $ */
+/*	$OpenBSD: rde_update.c,v 1.55 2007/03/16 14:06:57 claudio Exp $ */
 
 /*
  * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@@ -515,7 +515,7 @@ up_get_nexthop(struct rde_peer *peer, struct rde_aspath *a)
 		else if (a->nexthop->exit_nexthop.v4.s_addr ==
 		    peer->remote_addr.v4.s_addr)
 			/*
-			 * per rfc: if remote peer address is equal to
+			 * per RFC: if remote peer address is equal to
 			 * the nexthop set the nexthop to our local address.
 			 * This reduces the risk of routing loops.
 			 */
diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c
index 1440ddd8c46..22042652d02 100644
--- a/usr.sbin/bgpd/session.c
+++ b/usr.sbin/bgpd/session.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: session.c,v 1.270 2007/02/22 08:34:18 henning Exp $ */
+/*	$OpenBSD: session.c,v 1.271 2007/03/16 14:06:57 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004, 2005 Henning Brauer <henning@openbsd.org>
@@ -1061,7 +1061,7 @@ session_connect(struct peer *peer)
 	struct sockaddr		*sa;
 
 	/*
-	 * we do not need the overcomplicated collision detection rfc1771
+	 * we do not need the overcomplicated collision detection RFC 1771
 	 * describes; we simply make sure there is only ever one concurrent
 	 * tcp connection per peer.
 	 */
@@ -1184,7 +1184,7 @@ session_setup_socket(struct peer *p)
 		return (-1);
 	}
 
-	/* set precedence, see rfc1771 appendix 5 */
+	/* set precedence, see RFC 1771 appendix 5 */
 	if (p->conf.remote_addr.af == AF_INET &&
 	    setsockopt(p->fd, IPPROTO_IP, IP_TOS, &pre, sizeof(pre)) == -1) {
 		log_peer_warn(&p->conf,
@@ -1356,7 +1356,7 @@ session_open(struct peer *p)
 		return;
 	}
 
-	/* multiprotocol extensions, RFC 2858 */
+	/* multiprotocol extensions, RFC 4760 */
 	if (p->capa.ann.mp_v4) {	/* 4 bytes data */
 		errs += session_capa_add(p, opb, CAPA_MP, 4, &optparamlen);
 		errs += session_capa_add_mp(opb, AFI_IPv4, p->capa.ann.mp_v4);
@@ -2163,7 +2163,7 @@ parse_capabilities(struct peer *peer, u_char *d, u_int16_t dlen)
 			capa_val = NULL;
 
 		switch (capa_code) {
-		case CAPA_MP:			/* RFC 2858 */
+		case CAPA_MP:			/* RFC 4760 */
 			if (capa_len != 4) {
 				log_peer_warnx(&peer->conf,
 				    "parse_capabilities: "