Wireshark · Ethereal-dev: Re: [Ethereal-dev] external plugin and exported symbols

[Paolo Abeni <paolo.abeni@xxxxxxxx>]

Hi all,

the attached patch clean a bit the ssl decryption related code, removing
a macro I used when the code was still for an external plugin.

Paolo

 
 
 --
 Email.it, the professional e-mail, gratis per te: http://www.email.it/f
 
 Sponsor:
 DVDNetRent: il primo noleggio on line senza spese di spedizione, per ricevere comodamente a casa i tuoi DVD preferiti!
 Clicca qui: http://adv.email.it/cgi-bin/foclick.cgi?mid=4631&d=8-2

Index: gtk/ssl-dlg.c
===================================================================
--- gtk/ssl-dlg.c	(revision 17214)
+++ gtk/ssl-dlg.c	(working copy)
@@ -62,10 +62,6 @@
 
 #include "ssl-dlg.h"
 
-#ifndef SSL_SUFFIX
-#define SSL_SUFFIX ""
-#endif
-
 /* Show Stream */
 typedef enum {
 	FROM_CLIENT,
@@ -211,7 +207,7 @@
     follow_info = g_new0(follow_info_t, 1);
     
     /* data will be passed via tap callback*/
-    msg = register_tap_listener("ssl"SSL_SUFFIX, follow_info, NULL,
+    msg = register_tap_listener("ssl", follow_info, NULL,
 	NULL, ssl_queue_packet_data, NULL);
     if (msg)
     {
Index: epan/dissectors/packet-ssl.c
===================================================================
--- epan/dissectors/packet-ssl.c	(revision 17214)
+++ epan/dissectors/packet-ssl.c	(working copy)
@@ -3870,9 +3870,6 @@
  * Standard Ethereal Protocol Registration and housekeeping
  *
  *********************************************************************/
-#ifndef SSL_SUFFIX
-#define SSL_SUFFIX ""
-#endif
 void
 proto_register_ssl(void)
 {
@@ -4271,8 +4268,8 @@
     };
 
     /* Register the protocol name and description */
-    proto_ssl = proto_register_protocol("Secure Socket Layer"SSL_SUFFIX,
-                                        "SSL"SSL_SUFFIX, "ssl"SSL_SUFFIX);
+    proto_ssl = proto_register_protocol("Secure Socket Layer",
+                                        "SSL", "ssl");
 
     /* Required function calls to register the header fields and
      * subtrees used */
@@ -4299,13 +4296,13 @@
              (const char **)&ssl_ports_list);
     }
 
-    register_dissector("ssl"SSL_SUFFIX, dissect_ssl, proto_ssl);
+    register_dissector("ssl", dissect_ssl, proto_ssl);
     
     register_init_routine(ssl_init);
     ssl_lib_init();
-    ssl_tap = register_tap("ssl"SSL_SUFFIX);
+    ssl_tap = register_tap("ssl");
     ssl_debug_printf("proto_register_ssl: registered tap %s:%d\n",
-        "ssl"SSL_SUFFIX, ssl_tap);
+        "ssl", ssl_tap);
 }
 
 /* If this dissector uses sub-dissector registration add a registration
@@ -4315,7 +4312,7 @@
 void
 proto_reg_handoff_ssl(void)
 {
-    ssl_handle = find_dissector("ssl"SSL_SUFFIX);
+    ssl_handle = find_dissector("ssl");
     
     /* add now dissector to default ports.*/
     ssl_parse();