aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/cli/tap-rtp.c18
-rw-r--r--ui/qt/rtp_audio_stream.cpp20
-rw-r--r--ui/qt/rtp_audio_stream.h8
-rw-r--r--ui/qt/rtp_player_dialog.h2
-rw-r--r--ui/qt/voip_calls_dialog.cpp4
-rw-r--r--ui/rtp_stream.h2
-rw-r--r--ui/rtp_stream_id.h2
-rw-r--r--ui/tap-rtp-common.c4
-rw-r--r--ui/tap-rtp-common.h4
-rw-r--r--ui/voip_calls.c42
-rw-r--r--ui/voip_calls.h4
11 files changed, 55 insertions, 55 deletions
diff --git a/ui/cli/tap-rtp.c b/ui/cli/tap-rtp.c
index bab6db924d..0d4e55dff7 100644
--- a/ui/cli/tap-rtp.c
+++ b/ui/cli/tap-rtp.c
@@ -37,18 +37,18 @@
#include "ui/rtp_stream.h"
#include "ui/tap-rtp-common.h"
-void register_tap_listener_rtp_streams(void);
-static void rtp_streams_stat_draw_cb(rtpstream_tapinfo_t *tapinfo);
+void register_tap_listener_rtpstreams(void);
+static void rtpstreams_stat_draw_cb(rtpstream_tapinfo_t *tapinfo);
/* The one and only global rtpstream_tapinfo_t structure for tshark and wireshark.
*/
static rtpstream_tapinfo_t the_tapinfo_struct =
- { NULL, rtp_streams_stat_draw_cb, NULL,
+ { NULL, rtpstreams_stat_draw_cb, NULL,
NULL, 0, NULL, 0, TAP_ANALYSE, NULL, NULL, NULL, FALSE
};
static void
-rtp_streams_stat_draw_cb(rtpstream_tapinfo_t *tapinfo _U_)
+rtpstreams_stat_draw_cb(rtpstream_tapinfo_t *tapinfo _U_)
{
GList *list;
rtpstream_info_t *strinfo;
@@ -100,24 +100,24 @@ rtp_streams_stat_draw_cb(rtpstream_tapinfo_t *tapinfo _U_)
static void
-rtp_streams_stat_init(const char *opt_arg _U_, void *userdata _U_)
+rtpstreams_stat_init(const char *opt_arg _U_, void *userdata _U_)
{
register_tap_listener_rtpstream(&the_tapinfo_struct, NULL, NULL);
}
-static stat_tap_ui rtp_streams_stat_ui = {
+static stat_tap_ui rtpstreams_stat_ui = {
REGISTER_STAT_GROUP_GENERIC,
NULL,
"rtp,streams",
- rtp_streams_stat_init,
+ rtpstreams_stat_init,
0,
NULL
};
void
-register_tap_listener_rtp_streams(void)
+register_tap_listener_rtpstreams(void)
{
- register_stat_tap_ui(&rtp_streams_stat_ui, NULL);
+ register_stat_tap_ui(&rtpstreams_stat_ui, NULL);
}
/*
diff --git a/ui/qt/rtp_audio_stream.cpp b/ui/qt/rtp_audio_stream.cpp
index a54e61aaef..5b422cc2da 100644
--- a/ui/qt/rtp_audio_stream.cpp
+++ b/ui/qt/rtp_audio_stream.cpp
@@ -33,12 +33,12 @@
#include <QVariant>
// To do:
-// - Only allow one rtp_stream_info_t per RtpAudioStream?
+// - Only allow one rtpstream_info_t per RtpAudioStream?
static spx_int16_t default_audio_sample_rate_ = 8000;
static const spx_int16_t visual_sample_rate_ = 1000;
-RtpAudioStream::RtpAudioStream(QObject *parent, rtpstream_info_t *rtp_stream) :
+RtpAudioStream::RtpAudioStream(QObject *parent, rtpstream_info_t *rtpstream) :
QObject(parent),
decoders_hash_(rtp_decoder_hash_table_new()),
global_start_rel_time_(0.0),
@@ -53,7 +53,7 @@ RtpAudioStream::RtpAudioStream(QObject *parent, rtpstream_info_t *rtp_stream) :
jitter_buffer_size_(50),
timing_mode_(RtpAudioStream::JitterBuffer)
{
- rtpstream_id_copy(&rtp_stream->id, &id_);
+ rtpstream_id_copy(&rtpstream->id, &id_);
// We keep visual samples in memory. Make fewer of them.
visual_resampler_ = speex_resampler_init(1, default_audio_sample_rate_,
@@ -81,10 +81,10 @@ RtpAudioStream::~RtpAudioStream()
rtpstream_id_free(&id_);
}
-bool RtpAudioStream::isMatch(const rtpstream_info_t *rtp_stream) const
+bool RtpAudioStream::isMatch(const rtpstream_info_t *rtpstream) const
{
- if (rtp_stream
- && rtpstream_id_equal(&id_, &(rtp_stream->id), RTPSTREAM_ID_EQUAL_SSRC))
+ if (rtpstream
+ && rtpstream_id_equal(&id_, &(rtpstream->id), RTPSTREAM_ID_EQUAL_SSRC))
return true;
return false;
}
@@ -100,12 +100,12 @@ bool RtpAudioStream::isMatch(const _packet_info *pinfo, const _rtp_info *rtp_inf
// XXX We add multiple RTP streams here because that's what the GTK+ UI does.
// Should we make these distinct, with their own waveforms? It seems like
// that would simplify a lot of things.
-void RtpAudioStream::addRtpStream(const rtpstream_info_t *rtp_stream)
+void RtpAudioStream::addRtpStream(const rtpstream_info_t *rtpstream)
{
- if (!rtp_stream) return;
+ if (!rtpstream) return;
- // RTP_STREAM_DEBUG("added %d:%u packets", g_list_length(rtp_stream->rtp_packet_list), rtp_stream->packet_count);
- rtp_streams_ << rtp_stream;
+ // RTP_STREAM_DEBUG("added %d:%u packets", g_list_length(rtpstream->rtp_packet_list), rtpstream->packet_count);
+ rtpstreams_ << rtpstream;
}
void RtpAudioStream::addRtpPacket(const struct _packet_info *pinfo, const struct _rtp_info *rtp_info)
diff --git a/ui/qt/rtp_audio_stream.h b/ui/qt/rtp_audio_stream.h
index fd6020235d..cc69dc1625 100644
--- a/ui/qt/rtp_audio_stream.h
+++ b/ui/qt/rtp_audio_stream.h
@@ -39,11 +39,11 @@ class RtpAudioStream : public QObject
public:
enum TimingMode { JitterBuffer, RtpTimestamp, Uninterrupted };
- explicit RtpAudioStream(QObject *parent, rtpstream_info_t *rtp_stream);
+ explicit RtpAudioStream(QObject *parent, rtpstream_info_t *rtpstream);
~RtpAudioStream();
- bool isMatch(const rtpstream_info_t *rtp_stream) const;
+ bool isMatch(const rtpstream_info_t *rtpstream) const;
bool isMatch(const struct _packet_info *pinfo, const struct _rtp_info *rtp_info) const;
- void addRtpStream(const rtpstream_info_t *rtp_stream);
+ void addRtpStream(const rtpstream_info_t *rtpstream);
void addRtpPacket(const struct _packet_info *pinfo, const struct _rtp_info *rtp_info);
void reset(double start_rel_time);
void decode();
@@ -146,7 +146,7 @@ private:
QVector<struct _rtp_packet *>rtp_packets_;
QTemporaryFile *tempfile_;
struct _GHashTable *decoders_hash_;
- QList<const rtpstream_info_t *>rtp_streams_;
+ QList<const rtpstream_info_t *>rtpstreams_;
double global_start_rel_time_;
double start_abs_offset_;
double start_rel_time_;
diff --git a/ui/qt/rtp_player_dialog.h b/ui/qt/rtp_player_dialog.h
index a924b3876e..da8b1fb218 100644
--- a/ui/qt/rtp_player_dialog.h
+++ b/ui/qt/rtp_player_dialog.h
@@ -113,7 +113,7 @@ private:
QCPItemStraightLine *cur_play_pos_;
QString playback_error_;
-// const QString streamKey(const rtp_stream_info_t *rtp_stream);
+// const QString streamKey(const rtpstream_info_t *rtp_stream);
// const QString streamKey(const packet_info *pinfo, const struct _rtp_info *rtpinfo);
// Tap callbacks
diff --git a/ui/qt/voip_calls_dialog.cpp b/ui/qt/voip_calls_dialog.cpp
index d7c093c69e..a39a900613 100644
--- a/ui/qt/voip_calls_dialog.cpp
+++ b/ui/qt/voip_calls_dialog.cpp
@@ -177,7 +177,7 @@ void VoipCallsDialog::tapDraw(void *tapinfo_ptr)
GList *graph_item = g_queue_peek_nth_link(tapinfo->graph_analysis->items, 0);
for (; graph_item; graph_item = g_list_next(graph_item)) {
- for (GList *rsi_entry = g_list_first(tapinfo->rtp_stream_list); rsi_entry; rsi_entry = g_list_next(rsi_entry)) {
+ for (GList *rsi_entry = g_list_first(tapinfo->rtpstream_list); rsi_entry; rsi_entry = g_list_next(rsi_entry)) {
seq_analysis_item_t * sai = (seq_analysis_item_t *)graph_item->data;
rtpstream_info_t *rsi = (rtpstream_info_t *)rsi_entry->data;
@@ -391,7 +391,7 @@ void VoipCallsDialog::showPlayer()
voip_calls_info_t *vci = VoipCallsInfoModel::indexToCallInfo(index);
if (!vci) continue;
- for (GList *rsi_entry = g_list_first(tapinfo_.rtp_stream_list); rsi_entry; rsi_entry = g_list_next(rsi_entry)) {
+ for (GList *rsi_entry = g_list_first(tapinfo_.rtpstream_list); rsi_entry; rsi_entry = g_list_next(rsi_entry)) {
rtpstream_info_t *rsi = (rtpstream_info_t *)rsi_entry->data;
if (!rsi) continue;
diff --git a/ui/rtp_stream.h b/ui/rtp_stream.h
index a3125e8cd3..7298c94d31 100644
--- a/ui/rtp_stream.h
+++ b/ui/rtp_stream.h
@@ -85,7 +85,7 @@ struct _rtpstream_tapinfo {
tap_mark_packet_cb tap_mark_packet; /**< packet marking callback */
void *tap_data; /**< data for tap callbacks */
int nstreams; /**< number of streams in the list */
- GList *strinfo_list; /**< list of rtp_stream_info_t* */
+ GList *strinfo_list; /**< list of rtpstream_info_t* */
int npackets; /**< total number of rtp packets of all streams */
/* used while tapping. user shouldn't modify these */
tap_mode_t mode;
diff --git a/ui/rtp_stream_id.h b/ui/rtp_stream_id.h
index a303beb865..d5fb53a475 100644
--- a/ui/rtp_stream_id.h
+++ b/ui/rtp_stream_id.h
@@ -38,7 +38,7 @@ typedef struct _rtpstream_id {
} rtpstream_id_t;
/**
- * Copy rtp_stream_id_t structure
+ * Copy rtpstream_id_t structure
*/
void rtpstream_id_copy(const rtpstream_id_t *src, rtpstream_id_t *dest);
diff --git a/ui/tap-rtp-common.c b/ui/tap-rtp-common.c
index 2cfb43846e..fc3b006c84 100644
--- a/ui/tap-rtp-common.c
+++ b/ui/tap-rtp-common.c
@@ -45,7 +45,7 @@ typedef struct st_rtpdump_info {
} rtpdump_info_t;
/****************************************************************************/
-/* GCompareFunc style comparison function for rtp_stream_info_t */
+/* GCompareFunc style comparison function for rtpstream_info_t */
gint rtpstream_info_cmp(gconstpointer aa, gconstpointer bb)
{
const rtpstream_info_t* a = (const rtpstream_info_t*)aa;
@@ -350,7 +350,7 @@ int rtpstream_packet_cb(void *arg, packet_info *pinfo, epan_dissect_t *edt _U_,
}
/****************************************************************************/
-/* evaluate rtp_stream_info_t calculations */
+/* evaluate rtpstream_info_t calculations */
/* - code is gathered from existing GTK/Qt/tui sources related to RTP statistics calculation
* - one place for calculations ensures that all wireshark tools shows same output for same input and avoids code duplication
*/
diff --git a/ui/tap-rtp-common.h b/ui/tap-rtp-common.h
index 29b2f635f9..48186c2353 100644
--- a/ui/tap-rtp-common.h
+++ b/ui/tap-rtp-common.h
@@ -43,7 +43,7 @@ typedef struct _tap_rtp_save_info_t {
gboolean saved;
} tap_rtp_save_info_t;
-typedef struct _rtp_stream_info_calc {
+typedef struct _rtpstream_info_calc {
gchar *src_addr_str;
guint16 src_port;
gchar *dst_addr_str;
@@ -112,7 +112,7 @@ void rtp_write_header(rtpstream_info_t*, FILE*);
int rtpstream_packet_cb(void*, packet_info*, epan_dissect_t *, const void *);
/**
- * Evaluate rtp_stream_info_t calculations
+ * Evaluate rtpstream_info_t calculations
*/
void rtpstream_info_calculate(const rtpstream_info_t *strinfo, rtpstream_info_calc_t *calc);
diff --git a/ui/voip_calls.c b/ui/voip_calls.c
index e1790b9a34..162f1af8a8 100644
--- a/ui/voip_calls.c
+++ b/ui/voip_calls.c
@@ -262,7 +262,7 @@ voip_calls_reset_all_taps(voip_calls_tapinfo_t *tapinfo)
rtpstream_info_t *strinfo;
GList *list = NULL;
- /* VOIP_CALLS_DEBUG("reset packets: %d streams: %d", tapinfo->npackets, tapinfo->nrtp_streams); */
+ /* VOIP_CALLS_DEBUG("reset packets: %d streams: %d", tapinfo->npackets, tapinfo->nrtpstreams); */
/* free the data items first */
list = g_queue_peek_nth_link(tapinfo->callsinfos, 0);
@@ -288,7 +288,7 @@ voip_calls_reset_all_taps(voip_calls_tapinfo_t *tapinfo)
g_hash_table_remove_all (tapinfo->callsinfo_hashtable[SIP_HASH]);
/* free the strinfo data items first */
- list = g_list_first(tapinfo->rtp_stream_list);
+ list = g_list_first(tapinfo->rtpstream_list);
while(list)
{
strinfo = (rtpstream_info_t *)list->data;
@@ -296,8 +296,8 @@ voip_calls_reset_all_taps(voip_calls_tapinfo_t *tapinfo)
wmem_free(NULL, strinfo->ed137_info);
list = g_list_next(list);
}
- g_list_free(tapinfo->rtp_stream_list);
- tapinfo->rtp_stream_list = NULL;
+ g_list_free(tapinfo->rtpstream_list);
+ tapinfo->rtpstream_list = NULL;
if (tapinfo->h245_labels) {
memset(tapinfo->h245_labels, 0, sizeof(h245_labels_t));
@@ -557,15 +557,15 @@ rtp_reset(void *tap_offset_ptr)
GList *list;
/* free the data items first */
- list = g_list_first(tapinfo->rtp_stream_list);
+ list = g_list_first(tapinfo->rtpstream_list);
while (list)
{
g_free(list->data);
list = g_list_next(list);
}
- g_list_free(tapinfo->rtp_stream_list);
- tapinfo->rtp_stream_list = NULL;
- tapinfo->nrtp_streams = 0;
+ g_list_free(tapinfo->rtpstream_list);
+ tapinfo->rtpstream_list = NULL;
+ tapinfo->nrtpstreams = 0;
if (tapinfo->tap_reset) {
tapinfo->tap_reset(tapinfo);
@@ -597,7 +597,7 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c
}
/* check whether we already have a RTP stream with this setup frame and ssrc in the list */
- list = g_list_first(tapinfo->rtp_stream_list);
+ list = g_list_first(tapinfo->rtpstream_list);
while (list)
{
tmp_listinfo=(rtpstream_info_t *)list->data;
@@ -657,7 +657,7 @@ rtp_packet(void *tap_offset_ptr, packet_info *pinfo, epan_dissect_t *edt, void c
} else {
strinfo->ed137_info = NULL;
}
- tapinfo->rtp_stream_list = g_list_prepend(tapinfo->rtp_stream_list, strinfo);
+ tapinfo->rtpstream_list = g_list_prepend(tapinfo->rtpstream_list, strinfo);
}
/* Add the info to the existing RTP stream */
@@ -684,7 +684,7 @@ static void
rtp_draw(void *tap_offset_ptr)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_);
- GList *rtp_streams_list;
+ GList *rtpstreams_list;
rtpstream_info_t *rtp_listinfo;
/* GList *voip_calls_graph_list; */
seq_analysis_item_t *gai = NULL;
@@ -694,10 +694,10 @@ rtp_draw(void *tap_offset_ptr)
gchar time_str[COL_MAX_LEN];
/* add each rtp stream to the graph */
- rtp_streams_list = g_list_first(tapinfo->rtp_stream_list);
- while (rtp_streams_list)
+ rtpstreams_list = g_list_first(tapinfo->rtpstream_list);
+ while (rtpstreams_list)
{
- rtp_listinfo = (rtpstream_info_t *)rtp_streams_list->data;
+ rtp_listinfo = (rtpstream_info_t *)rtpstreams_list->data;
/* using the setup frame number of the RTP stream, we get the call number that it belongs to*/
/* voip_calls_graph_list = g_list_first(tapinfo->graph_analysis->list); */
@@ -744,8 +744,8 @@ rtp_draw(void *tap_offset_ptr)
g_hash_table_insert(tapinfo->graph_analysis->ht, &rtp_listinfo->start_fd, new_gai);
}
}
- rtp_streams_list = g_list_next(rtp_streams_list);
- } /* while (rtp_streams_list) */
+ rtpstreams_list = g_list_next(rtpstreams_list);
+ } /* while (rtpstreams_list) */
if (tapinfo->tap_draw && (tapinfo->redraw & REDRAW_RTP)) {
tapinfo->tap_draw(tapinfo);
@@ -757,7 +757,7 @@ static void
rtp_packet_draw(void *tap_offset_ptr)
{
voip_calls_tapinfo_t *tapinfo = tap_id_to_base(tap_offset_ptr, tap_id_offset_rtp_);
- GList *rtp_streams_list;
+ GList *rtpstreams_list;
rtpstream_info_t *rtp_listinfo;
GList *voip_calls_graph_list;
guint item;
@@ -768,10 +768,10 @@ rtp_packet_draw(void *tap_offset_ptr)
gchar time_str[COL_MAX_LEN];
/* add each rtp stream to the graph */
- rtp_streams_list = g_list_first(tapinfo->stream_list);
- while (rtp_streams_list)
+ rtpstreams_list = g_list_first(tapinfo->stream_list);
+ while (rtpstreams_list)
{
- rtp_listinfo = rtp_streams_list->data;
+ rtp_listinfo = rtpstreams_list->data;
/* using the setup frame number of the RTP stream, we get the call number that it belongs to*/
voip_calls_graph_list = g_list_first(tapinfo->graph_analysis->list);
@@ -832,7 +832,7 @@ rtp_packet_draw(void *tap_offset_ptr)
}
voip_calls_graph_list = g_list_next(voip_calls_graph_list);
}
- rtp_streams_list = g_list_next(rtp_streams_list);
+ rtpstreams_list = g_list_next(rtpstreams_list);
}
}
#endif
diff --git a/ui/voip_calls.h b/ui/voip_calls.h
index 9c95603a0e..7c06dbe563 100644
--- a/ui/voip_calls.h
+++ b/ui/voip_calls.h
@@ -183,8 +183,8 @@ typedef struct _voip_calls_tapinfo {
int rejected_calls;
seq_analysis_info_t *graph_analysis;
epan_t *session; /**< epan session */
- int nrtp_streams; /**< number of rtp streams */
- GList* rtp_stream_list; /**< list of rtp_stream_info_t */
+ int nrtpstreams; /**< number of rtp streams */
+ GList* rtpstream_list; /**< list of rtpstream_info_t */
guint32 rtp_evt_frame_num;
guint8 rtp_evt;
gboolean rtp_evt_end;
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 10:15:31 +0000