diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-06-23 17:15:34 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-06-26 05:59:21 +0000 |
| commit | 581d44f4ad84e6147ce60b8a8536fb17512a423d (patch) | |
| tree | 7874900a55d34b273746c622431281fffb9313cd /epan | |
| parent | b47aca5fd1782cea68b2cba54263a75b5a3007e8 (diff) | |
h248: rename shadow variable.
Change-Id: I98545776127a0cc3b5d9c44bb625a217672b4443
Reviewed-on: https://code.wireshark.org/review/16099
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/asn1/h248/packet-h248-template.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/asn1/h248/packet-h248-template.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-h248.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-h248.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-megaco.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/asn1/h248/packet-h248-template.c b/epan/dissectors/asn1/h248/packet-h248-template.c index 229fe4dc39..ee3cea841d 100644 --- a/epan/dissectors/asn1/h248/packet-h248-template.c +++ b/epan/dissectors/asn1/h248/packet-h248-template.c @@ -172,7 +172,7 @@ gcp_msg_t* gcp_msg(packet_info* pinfo, int o, gboolean keep_persistent_data) { } else { m = wmem_new(wmem_file_scope(), gcp_msg_t); m->framenum = framenum; - m->time = pinfo->abs_ts; + m->frametime = pinfo->abs_ts; m->trxs = NULL; m->committed = FALSE; diff --git a/epan/dissectors/asn1/h248/packet-h248-template.h b/epan/dissectors/asn1/h248/packet-h248-template.h index 80af626e31..e6e15da0d8 100644 --- a/epan/dissectors/asn1/h248/packet-h248-template.h +++ b/epan/dissectors/asn1/h248/packet-h248-template.h @@ -95,7 +95,7 @@ typedef struct _gcp_msg_t { guint32 lo_addr; guint32 hi_addr; guint32 framenum; - nstime_t time; + nstime_t frametime; struct _gcp_trx_msg_t* trxs; gboolean committed; } gcp_msg_t; diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 90fa038120..20528c4f43 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -647,7 +647,7 @@ gcp_msg_t* gcp_msg(packet_info* pinfo, int o, gboolean keep_persistent_data) { } else { m = wmem_new(wmem_file_scope(), gcp_msg_t); m->framenum = framenum; - m->time = pinfo->abs_ts; + m->frametime = pinfo->abs_ts; m->trxs = NULL; m->committed = FALSE; diff --git a/epan/dissectors/packet-h248.h b/epan/dissectors/packet-h248.h index 1dd76338a1..260fd589a0 100644 --- a/epan/dissectors/packet-h248.h +++ b/epan/dissectors/packet-h248.h @@ -103,7 +103,7 @@ typedef struct _gcp_msg_t { guint32 lo_addr; guint32 hi_addr; guint32 framenum; - nstime_t time; + nstime_t frametime; struct _gcp_trx_msg_t* trxs; gboolean committed; } gcp_msg_t; diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index 1044287587..c8107a9e28 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -368,7 +368,7 @@ megacostat_packet(void *pms, packet_info *pinfo, epan_dissect_t *edt _U_, const else { ms->time_stats[0].open_req_num--; /* calculate time delta between request and response */ - nstime_delta(&delta, &pinfo->abs_ts, &mi->trx->initial->time); + nstime_delta(&delta, &pinfo->abs_ts, &mi->trx->initial->frametime); switch(mi->type) { |