X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/2b56cf092388290689ec6b4dd7f1790b01eea289..0f24a43a7e9fbdcff2baae3990939b2bc25d9fd1:/print-rx.c

diff --git a/print-rx.c b/print-rx.c
index f91e936c..3a2a51a0 100644
--- a/print-rx.c
+++ b/print-rx.c
@@ -534,6 +534,7 @@ rx_print(netdissect_options *ndo,
 	uint8_t type, flags;
 	uint32_t opcode;
 
+	ndo->ndo_protocol = "rx";
 	if (!ND_TTEST_LEN(bp, sizeof(struct rx_header))) {
 		ND_PRINT(" [|rx] (%u)", length);
 		return;
@@ -770,7 +771,7 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, u_int sport,
 				goto trunc; \
 			bp += sizeof(uint32_t); \
 			ND_PRINT(" \""); \
-			if (fn_printn(ndo, bp, _i, ndo->ndo_snapend)) \
+			if (nd_printn(ndo, bp, _i, ndo->ndo_snapend)) \
 				goto trunc; \
 			ND_PRINT("\""); \
 			bp += ((_i + sizeof(uint32_t) - 1) / sizeof(uint32_t)) * sizeof(uint32_t); \
@@ -868,7 +869,7 @@ rx_cache_find(const struct rx_header *rxh, const struct ip *ip, u_int sport,
 			} \
 			s[(MAX)] = '\0'; \
 			ND_PRINT(" \""); \
-			fn_print(ndo, s, NULL); \
+			fn_print_str(ndo, s); \
 			ND_PRINT("\""); \
 		}
 
@@ -1022,6 +1023,7 @@ fs_print(netdissect_options *ndo,
 			}
 			if (j == 0)
 				ND_PRINT(" <none!>");
+			break;
 		}
 		case 65537:	/* Fetch data 64 */
 			FIDOUT();
@@ -1189,7 +1191,7 @@ acl_print(netdissect_options *ndo,
 			goto finish;
 		s += n;
 		ND_PRINT(" +{");
-		fn_print(ndo, (u_char *)user, NULL);
+		fn_print_str(ndo, (u_char *)user);
 		ND_PRINT(" ");
 		ACLOUT(acl);
 		ND_PRINT("}");
@@ -1203,7 +1205,7 @@ acl_print(netdissect_options *ndo,
 			goto finish;
 		s += n;
 		ND_PRINT(" -{");
-		fn_print(ndo, (u_char *)user, NULL);
+		fn_print_str(ndo, (u_char *)user);
 		ND_PRINT(" ");
 		ACLOUT(acl);
 		ND_PRINT("}");
@@ -1283,6 +1285,7 @@ cb_print(netdissect_options *ndo,
 				bp += sizeof(uint32_t);
 				tok2str(cb_types, "type %u", t);
 			}
+			break;
 		}
 		case 214: {
 			ND_PRINT(" afsuuid");
@@ -1744,6 +1747,7 @@ vldb_reply_print(netdissect_options *ndo,
 			INTOUT();
 			ND_PRINT(" nextindex");
 			INTOUT();
+			ND_FALL_THROUGH;
 		case 503:	/* Get entry by id */
 		case 504:	/* Get entry by name */
 		{	uint32_t nservers, j;
@@ -1793,6 +1797,7 @@ vldb_reply_print(netdissect_options *ndo,
 			INTOUT();
 			ND_PRINT(" nextindex");
 			INTOUT();
+			ND_FALL_THROUGH;
 		case 518:	/* Get entry by ID N */
 		case 519:	/* Get entry by name N */
 		{	uint32_t nservers, j;
@@ -2786,7 +2791,7 @@ rx_ack_print(netdissect_options *ndo,
 				 * the range (such as an nacked packet in
 				 * the middle of some acked packets),
 				 * then print the current packet number
-				 * seperated from the last number by
+				 * separated from the last number by
 				 * a comma.
 				 */
 
@@ -2809,7 +2814,7 @@ rx_ack_print(netdissect_options *ndo,
 				 * we hit a nack ... in _this_ case we
 				 * want to print out the range of packets
 				 * that were acked, so we need to print
-				 * the _previous_ packet number seperated
+				 * the _previous_ packet number separated
 				 * from the first by a dash (-).  Since we
 				 * already printed the first packet above,
 				 * just print the final packet.  Don't