diff options
| author | Jiri Novak <j.novak@netsystem.cz> | 2018-06-14 23:19:01 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-06-19 15:05:12 +0000 |
| commit | 27a1906c582b9c7dcd17e7db2726a1059e3aaf8a (patch) | |
| tree | 44b713c72d6c5cac6ca9f319cc8c8511d8597834 /sharkd_session.c | |
| parent | 434fbe20dd5e2dc58473fea1363a7350486bc33c (diff) | |
RTP: Code clean up
Changes:
- rtpstream_packet renamed to rtpstream_packet_cb to follow *_cb pattern
- variables/types used in iax2_analysis_dialog were created as copy of *rtp* ones, but names were left as *rtp* -> *iax2*
- struct _rtp_stream_info replaced with rtp_stream_info_t
- there was tap-rtp-analysis.h, but no tap-rtp-analysis.c - related content was moved from tap-rtp-common.c
- *rtp_stream* functions renamed to *rtpstream*
- renamed rtp_stream_info_t to rtpstream_info_t to follow *rtpstream* pattern.
- renamed ui/rtp_stream.c rtpstream_draw -> rtpstream_draw_cb
Change-Id: Ib11ff5367cc464ea1b0c73432bc50b0eb9cd203e
Reviewed-on: https://code.wireshark.org/review/28299
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'sharkd_session.c')
| -rw-r--r-- | sharkd_session.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sharkd_session.c b/sharkd_session.c index abd7629663..3b2dee8136 100644 --- a/sharkd_session.c +++ b/sharkd_session.c @@ -50,6 +50,7 @@ #include <ui/voip_calls.h> #include <ui/rtp_stream.h> #include <ui/tap-rtp-common.h> +#include <ui/tap-rtp-analysis.h> #include <epan/to_str.h> #include <epan/addr_resolv.h> @@ -1335,7 +1336,7 @@ sharkd_session_packet_tap_rtp_analyse_cb(void *tapdata, packet_info *pinfo, epan tap_rtp_stat_t *statinfo = &(rtp_req->statinfo); struct sharkd_analyse_rtp_items *item; - rtp_packet_analyse(statinfo, pinfo, rtpinfo); + rtppacket_analyse(statinfo, pinfo, rtpinfo); item = (struct sharkd_analyse_rtp_items *) g_malloc(sizeof(struct sharkd_analyse_rtp_items)); @@ -2095,7 +2096,7 @@ sharkd_session_process_tap_rtp_cb(void *arg) printf(",\"streams\":["); for (listx = g_list_first(rtp_tapinfo->strinfo_list); listx; listx = listx->next) { - rtp_stream_info_t *streaminfo = (rtp_stream_info_t *) listx->data; + rtpstream_info_t *streaminfo = (rtpstream_info_t *) listx->data; char *src_addr, *dst_addr; char *payload; @@ -2432,7 +2433,7 @@ sharkd_session_process_tap(char *buf, const jsmntok_t *tokens, int count) } else if (!strcmp(tok_tap, "rtp-streams")) { - tap_error = register_tap_listener("rtp", &rtp_tapinfo, tap_filter, 0, rtpstream_reset_cb, rtpstream_packet, sharkd_session_process_tap_rtp_cb); + tap_error = register_tap_listener("rtp", &rtp_tapinfo, tap_filter, 0, rtpstream_reset_cb, rtpstream_packet_cb, sharkd_session_process_tap_rtp_cb); tap_data = &rtp_tapinfo; tap_free = rtpstream_reset_cb; |