OpenFlow: Have a function for each message type.

[tcpdump] / print-ssh.c

diff --git a/print-ssh.c b/print-ssh.c
index 0126bd0ed175b2d1bd478994e9c6023c524867dc..a6c66d74507a74512f71c235e9add3a985c85a9c 100644 (file)
--- a/print-ssh.c
+++ b/print-ssh.c
@@ -22,6 +22,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "netdissect-ctype.h"
+
 #include "netdissect.h"
 #include "extract.h"
 
@@ -29,7 +31,6 @@ static int
 ssh_print_version(netdissect_options *ndo, const u_char *pptr, u_int len)
 {
        u_int idx = 0;
-       const char *pnp;
 
        if ( GET_U_1(pptr+idx) != 'S' )
                return 0;
@@ -45,14 +46,17 @@ ssh_print_version(netdissect_options *ndo, const u_char *pptr, u_int len)
        idx++;
 
        while (idx < len) {
-               if (GET_U_1(pptr + idx) == '\n') {
+               u_char c;
+
+               c = GET_U_1(pptr + idx);
+               if (c == '\n') {
                        /*
                         * LF without CR; end of line.
                         * Skip the LF and print the line, with the
                         * exception of the LF.
                         */
                        goto print;
-               } else if (GET_U_1(pptr + idx) == '\r') {
+               } else if (c == '\r') {
                        /* CR - any LF? */
                        if ((idx+1) >= len) {
                                /* not in this packet */
@@ -72,8 +76,7 @@ ssh_print_version(netdissect_options *ndo, const u_char *pptr, u_int len)
                         * if it were binary data and don't print it.
                         */
                        goto trunc;
-               } else if (!isascii(GET_U_1(pptr + idx)) ||
-                          !isprint(GET_U_1(pptr + idx)) ) {
+               } else if (!ND_ASCII_ISPRINT(c) ) {
                        /*
                         * Not a printable ASCII character; treat this
                         * as if it were binary data and don't print it.
@@ -86,9 +89,7 @@ trunc:
        return -1;
 print:
        ND_PRINT(": ");
-       /* Capitalize the protocol name */
-       for (pnp = ndo->ndo_protocol; *pnp != '\0'; pnp++)
-               ND_PRINT("%c", ND_TOUPPER((u_char)*pnp));
+       nd_print_protocol_caps(ndo);
        ND_PRINT(": %.*s", (int)idx, pptr);
        return idx;
 }