Merge branch 'FRRouting:master' into master

Author: lsang6WIND

.clang-format

@@ -207,4 +207,21 @@ SpacesInSquareBrackets: false
 Standard: Cpp03
 TabWidth: 8
 UseTab: Always
+WhitespaceSensitiveMacros:
+  - "DEFPY"
+  - "DEFPY_HIDDEN"
+  - "DEFPY_NOSH"
+  - "DEFPY_YANG"
+  - "DEFPY_YANG_HIDDEN"
+  - "DEFPY_YANG_NOSH"
+  - "DEFSH"
+  - "DEFSH_HIDDEN"
+  - "DEFUN"
+  - "DEFUN_HIDDEN"
+  - "DEFUN_NOSH"
+  - "DEFUN_YANG"
+  - "DEFUN_YANG_HIDDEN"
+  - "DEFUN_YANG_NOSH"
+  - "DEFUNSH"
+  - "DEFUNSH_HIDDEN"
 ...

.gitignore

@@ -62,6 +62,7 @@
 *.cg.dot
 *.cg.svg
 *.xref
+*_tsexpand.h
 
 ### gcov outputs
 

bgpd/bgp_bmp.c

@@ -391,11 +391,11 @@ static int bmp_send_initiation(struct bmp *bmp)
 
 	bmp_common_hdr(s, BMP_VERSION_3, BMP_TYPE_INITIATION);
 
-#define BMP_INFO_TYPE_SYSDESCR	1
-#define BMP_INFO_TYPE_SYSNAME	2
-	bmp_put_info_tlv(s, BMP_INFO_TYPE_SYSDESCR,
-			FRR_FULL_NAME " " FRR_VER_SHORT);
-	bmp_put_info_tlv(s, BMP_INFO_TYPE_SYSNAME, cmd_hostname_get());
+#define BMP_INIT_INFO_TYPE_SYSDESCR 1
+#define BMP_INIT_INFO_TYPE_SYSNAME  2
+	bmp_put_info_tlv(s, BMP_INIT_INFO_TYPE_SYSDESCR,
+			 FRR_FULL_NAME " " FRR_VER_SHORT);
+	bmp_put_info_tlv(s, BMP_INIT_INFO_TYPE_SYSNAME, cmd_hostname_get());
 
 	len = stream_get_endp(s);
 	stream_putl_at(s, BMP_LENGTH_POS, len); /* message length is set. */
@@ -438,6 +438,7 @@ static struct stream *bmp_peerstate(struct peer *peer, bool down)
 	monotime_to_realtime(&uptime, &uptime_real);
 
 #define BGP_BMP_MAX_PACKET_SIZE	1024
+#define BMP_PEERUP_INFO_TYPE_STRING 0
 	s = stream_new(BGP_MAX_PACKET_SIZE);
 
 	if (peer_established(peer->connection) && !down) {
@@ -493,7 +494,8 @@ static struct stream *bmp_peerstate(struct peer *peer, bool down)
 		}
 
 		if (peer->desc)
-			bmp_put_info_tlv(s, 0, peer->desc);
+			bmp_put_info_tlv(s, BMP_PEERUP_INFO_TYPE_STRING,
+					 peer->desc);
 	} else {
 		uint8_t type;
 		size_t type_pos;
@@ -2494,7 +2496,7 @@ DEFPY(bmp_stats_send_experimental,
 {
 	VTY_DECLVAR_CONTEXT_SUB(bmp_targets, bt);
 
-	bt->stats_send_experimental = !!no;
+	bt->stats_send_experimental = !no;
 
 	return CMD_SUCCESS;
 }