ESP: Rename two printers

Rename esp_print_decodesecret() to esp_decodesecret_print() and
esp_print_decrypt_buffer_by_ikev2() to esp_decrypt_buffer_by_ikev2_print()
with _print suffix like in most similar cases.

diff --git a/netdissect.h b/netdissect.h
index 620c9a115bd693dbe822c311d1c50deb60cf524d..01cc60bba24cf8e6f525293ae17f36159b2fca1f 100644 (file)
--- a/netdissect.h
+++ b/netdissect.h
@@ -740,8 +740,8 @@ extern const char *dnnum_string(netdissect_options *, u_short);
 extern int decode_prefix4(netdissect_options *, const u_char *, u_int, char *, size_t);
 extern int decode_prefix6(netdissect_options *, const u_char *, u_int, char *, size_t);
 
-extern void esp_print_decodesecret(netdissect_options *);
-extern int esp_print_decrypt_buffer_by_ikev2(netdissect_options *, int,
+extern void esp_decodesecret_print(netdissect_options *);
+extern int esp_decrypt_buffer_by_ikev2_print(netdissect_options *, int,
                                             const u_char spii[8],
                                             const u_char spir[8],
                                             const u_char *, const u_char *);

diff --git a/print-esp.c b/print-esp.c
index 91d394ff61de8dc6f3d41db7e9b9030cd08c3d2c..0b3ecc910c3d0ced00fbc0d898f1cada09f2969b 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -277,7 +277,7 @@ do_decrypt(netdissect_options *ndo, const char *caller, struct sa_list *sa,
  * anything in the old buffer.  That will free the new buffer.
  */
 USES_APPLE_DEPRECATED_API
-int esp_print_decrypt_buffer_by_ikev2(netdissect_options *ndo,
+int esp_decrypt_buffer_by_ikev2_print(netdissect_options *ndo,
                                      int initiator,
                                      const u_char spii[8],
                                      const u_char spir[8],
@@ -315,7 +315,7 @@ int esp_print_decrypt_buffer_by_ikev2(netdissect_options *ndo,
 
        if(end <= ct) return 0;
 
-       pt = do_decrypt(ndo, "esp_print_decrypt_buffer_by_ikev2", sa, iv,
+       pt = do_decrypt(ndo, "esp_decrypt_buffer_by_ikev2_print", sa, iv,
            ct, ctlen);
        if (pt == NULL)
                return 0;
@@ -683,7 +683,7 @@ static void esp_init(netdissect_options *ndo _U_)
 }
 USES_APPLE_RST
 
-void esp_print_decodesecret(netdissect_options *ndo)
+void esp_decodesecret_print(netdissect_options *ndo)
 {
        char *line;
        char *p;
@@ -763,7 +763,7 @@ esp_print(netdissect_options *ndo,
                if (!ndo->ndo_espsecret)
                        return;
 
-               esp_print_decodesecret(ndo);
+               esp_decodesecret_print(ndo);
        }
 
        if (ndo->ndo_sa_list_head == NULL)

diff --git a/print-isakmp.c b/print-isakmp.c
index 21ca902744f0895671b9013a887d790bba8a179e..b3854d15f93d58da53e11dcc166026294d8e7bb9 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -2689,7 +2689,7 @@ ikev2_e_print(netdissect_options *ndo,
        np = GET_U_1(ext->np);
 
        /* try to decrypt it! */
-       if(esp_print_decrypt_buffer_by_ikev2(ndo,
+       if(esp_decrypt_buffer_by_ikev2_print(ndo,
                                             GET_U_1(base->flags) & ISAKMP_FLAG_I,
                                             base->i_ck, base->r_ck,
                                             dat, dat+dlen)) {
@@ -2701,7 +2701,7 @@ ikev2_e_print(netdissect_options *ndo,
                                ndo->ndo_snapend, phase, doi, proto, depth+1);
 
                /*
-                * esp_print_decrypt_buffer_by_ikev2 pushed information
+                * esp_decrypt_buffer_by_ikev2_print pushed information
                 * on the buffer stack; we're done with the buffer, so
                 * pop it (which frees the buffer)
                 */
@@ -3059,7 +3059,7 @@ isakmp_print(netdissect_options *ndo,
        /* initialize SAs */
        if (ndo->ndo_sa_list_head == NULL) {
                if (ndo->ndo_espsecret)
-                       esp_print_decodesecret(ndo);
+                       esp_decodesecret_print(ndo);
        }
 #endif