diff options
| author | Jiri Novak <j.novak@netsystem.cz> | 2018-06-21 15:16:03 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-06-25 14:16:26 +0000 |
| commit | 87973bf516432756f6948e969dbe9d6aa8a27017 (patch) | |
| tree | 121c07a3ba525f05e44fcb75ad1b6f7b110a6227 /ui/qt/iax2_analysis_dialog.cpp | |
| parent | 59c0b48d0aee24dc4efa32b459ef2822a6e52c07 (diff) | |
RTP: Common functions for allocation/deallocation of rtpstream_info_t
Change-Id: I9a0a11d238473a7c57d85547dca0713ed421a500
Reviewed-on: https://code.wireshark.org/review/28417
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/iax2_analysis_dialog.cpp')
| -rw-r--r-- | ui/qt/iax2_analysis_dialog.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/ui/qt/iax2_analysis_dialog.cpp b/ui/qt/iax2_analysis_dialog.cpp index 7bb3bd5cf7..996f1b2ee1 100644 --- a/ui/qt/iax2_analysis_dialog.cpp +++ b/ui/qt/iax2_analysis_dialog.cpp @@ -342,7 +342,8 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) : rtpstream_tapinfo_t tapinfo; /* Register the tap listener */ - memset(&tapinfo, 0, sizeof(rtpstream_tapinfo_t)); + rtpstream_info_init(&tapinfo); + tapinfo.tap_data = this; tapinfo.mode = TAP_ANALYSE; @@ -351,21 +352,28 @@ Iax2AnalysisDialog::Iax2AnalysisDialog(QWidget &parent, CaptureFile &cf) : rtpstream_scan(&tapinfo, cap_file_.capFile(), NULL); int num_streams = 0; - GList *filtered_list = NULL; + // TODO: Not used + //GList *filtered_list = NULL; for (GList *strinfo_list = g_list_first(tapinfo.strinfo_list); strinfo_list; strinfo_list = g_list_next(strinfo_list)) { rtpstream_info_t * strinfo = (rtpstream_info_t*)(strinfo_list->data); if (rtpstream_id_equal(&(strinfo->id), &(fwd_id_),RTPSTREAM_ID_EQUAL_NONE)) { ++num_streams; - filtered_list = g_list_prepend(filtered_list, strinfo); + // TODO: Not used + //filtered_list = g_list_prepend(filtered_list, strinfo); } if (rtpstream_id_equal(&(strinfo->id), &(rev_id_),RTPSTREAM_ID_EQUAL_NONE)) { ++num_streams; - filtered_list = g_list_append(filtered_list, strinfo); + // TODO: Not used + //filtered_list = g_list_append(filtered_list, strinfo); } + + rtpstream_info_free_data(strinfo); + g_free(list->data); } + g_list_free(tapinfo->strinfo_list); if (num_streams > 1) { // Open the RTP streams dialog. |