diff options
| author | Luis Ontanon <luis.ontanon@gmail.com> | 2007-03-25 21:56:08 +0000 |
|---|---|---|
| committer | Luis Ontanon <luis.ontanon@gmail.com> | 2007-03-25 21:56:08 +0000 |
| commit | 7233064c5a394fe4b86de1a75485ad116bc077dc (patch) | |
| tree | 17e90bfaa1b5006273322eff7c176d3d96356087 | |
| parent | 0b3d2a90ff16fb7e4a7726132d60adcc9bb6bc09 (diff) | |
rename h248_* to gcp_* according to changes in epan.
svn path=/trunk/; revision=21190
| -rw-r--r-- | gtk/voip_calls.c | 20 | ||||
| -rw-r--r-- | gtk/voip_calls_dlg.c | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/gtk/voip_calls.c b/gtk/voip_calls.c index 8d200d7a91..44f0d21865 100644 --- a/gtk/voip_calls.c +++ b/gtk/voip_calls.c @@ -2722,17 +2722,17 @@ remove_tap_listener_actrace_calls(void) -/**************************** TAP for H248 **********************************/ +/**************************** TAP for H248/MEGACO **********************************/ static gboolean have_h248_tap_listener = FALSE; -#define h248_is_req(type) ( type == H248_CMD_ADD_REQ || type == H248_CMD_MOVE_REQ || type == H248_CMD_MOD_REQ || \ - type == H248_CMD_SUB_REQ || type == H248_CMD_AUDITCAP_REQ || type == H248_CMD_AUDITVAL_REQ || \ - type == H248_CMD_NOTIFY_REQ || type == H248_CMD_SVCCHG_REQ || type == H248_CMD_TOPOLOGY_REQ || \ - type == H248_CMD_CTX_ATTR_AUDIT_REQ ) +#define gcp_is_req(type) ( type == GCP_CMD_ADD_REQ || type == GCP_CMD_MOVE_REQ || type == GCP_CMD_MOD_REQ || \ + type == GCP_CMD_SUB_REQ || type == GCP_CMD_AUDITCAP_REQ || type == GCP_CMD_AUDITVAL_REQ || \ + type == GCP_CMD_NOTIFY_REQ || type == GCP_CMD_SVCCHG_REQ || type == GCP_CMD_TOPOLOGY_REQ || \ + type == GCP_CMD_CTX_ATTR_AUDIT_REQ ) static int h248_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t *edt _U_, const void *prot_info) { voip_calls_tapinfo_t *tapinfo = &the_tapinfo_struct; - const h248_cmd_t* cmd = prot_info; + const gcp_cmd_t* cmd = prot_info; GList* list; voip_calls_info_t *strinfo = NULL; address* mgw; @@ -2745,7 +2745,7 @@ static int h248_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t * return 0; } - if ( h248_is_req(cmd->type) ) { + if ( gcp_is_req(cmd->type) ) { mgw = &(pinfo->dst); mgc = &(pinfo->src); } else { @@ -2799,14 +2799,14 @@ static int h248_calls_packet(void *ptr _U_, packet_info *pinfo, epan_dissect_t * } else { GString* s = g_string_new(""); - h248_terms_t *ctx_term; + gcp_terms_t *ctx_term; g_free(strinfo->from_identity); - strinfo->from_identity = g_strdup_printf("%s : %.8x", mgw_addr, ((h248_ctx_t*)strinfo->prot_info)->id); + strinfo->from_identity = g_strdup_printf("%s : %.8x", mgw_addr, ((gcp_ctx_t*)strinfo->prot_info)->id); g_free(strinfo->to_identity); - for (ctx_term = ((h248_ctx_t*)strinfo->prot_info)->terms.next; + for (ctx_term = ((gcp_ctx_t*)strinfo->prot_info)->terms.next; ctx_term; ctx_term = ctx_term->next ) { if ( ctx_term->term && ctx_term->term->str) { diff --git a/gtk/voip_calls_dlg.c b/gtk/voip_calls_dlg.c index 164333b7d9..1d577a6f8d 100644 --- a/gtk/voip_calls_dlg.c +++ b/gtk/voip_calls_dlg.c @@ -360,7 +360,7 @@ voip_calls_on_filter (GtkButton *button _U_, gtk_entry_append_text(GTK_ENTRY(main_display_filter_widget), filter_string_fwd->str); break; case TEL_H248: { - const h248_ctx_t* ctx = selected_call_fwd->prot_info; + const gcp_ctx_t* ctx = selected_call_fwd->prot_info; gtk_entry_append_text(GTK_ENTRY(main_display_filter_widget), ep_strdup_printf("h248.ctx == 0x%x", ctx->id )); break; } |