Decouple the media_type dissector table from HTTP.

Put the header containing the structure that should be passed to
dissectors in the media_type dissector table, and the code that creates
the media_type dissector table, into epan/dissectors/packet-media-type.h
and epan/dissectors/packet-media-type.h, respectively.

Change the names of types, enum values, structure fields, and variables
to speak of "media containers" and "content" rather than to speak of
HTTP or messages; HTTP is not the only protocol or data format that can
contain media type headers and data whose type is specified by media
type headers.

1 files changed, 4 insertions, 4 deletions

diff --git a/epan/dissectors/packet-sdp.c b/epan/dissectors/packet-sdp.c
index 165b4a4b52..0b11b4c5fd 100644
--- a/epan/dissectors/packet-sdp.c
+++ b/epan/dissectors/packet-sdp.c
@@ -29,7 +29,7 @@
 #include <wsutil/strtoi.h>
 #include <wsutil/str_util.h>
 
-#include "packet-http.h"
+#include "packet-media-type.h"
 #include "packet-sdp.h"
 
 /* un-comment the following as well as this line in conversation.c, to enable debug printing */
@@ -2606,9 +2606,9 @@ dissect_sdp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
     sdp_setup_info_t *setup_info = NULL;
 
     if (data) {
-        http_message_info_t *message_info = (http_message_info_t *)data;
-        if (message_info->type == SIP_DATA) {
-            setup_info = (sdp_setup_info_t *)message_info->data;
+        media_content_info_t *content_info = (media_content_info_t *)data;
+        if (content_info->type == MEDIA_CONTAINER_SIP_DATA) {
+            setup_info = (sdp_setup_info_t *)content_info->data;
         }
     }