Use g_get_charset instead of g_get_codeset.

[metze/wireshark/wip.git] / epan / gcp.c

diff --git a/epan/gcp.c b/epan/gcp.c
index 5937ce8c3a0e6caba30b968edb5eac302752c5b8..bee194583d85640f4a1db3ecb2cefce6d83ffa49 100644 (file)
--- a/epan/gcp.c
+++ b/epan/gcp.c
@@ -29,8 +29,6 @@
 
 #include "config.h"
 
-#include <epan/emem.h>
-
 #include "gcp.h"
 
 static wmem_tree_t* msgs = NULL;
@@ -87,7 +85,7 @@ void gcp_init(void) {
 
 gcp_msg_t* gcp_msg(packet_info* pinfo, int o, gboolean keep_persistent_data) {
     gcp_msg_t* m;
-    guint32 framenum = (guint32)pinfo->fd->num;
+    guint32 framenum = (guint32)pinfo->num;
     guint32 offset = (guint32)o;
     address* src = &(pinfo->src);
     address* dst = &(pinfo->dst);
@@ -110,7 +108,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->fd->abs_ts;
+            m->time = pinfo->abs_ts;
             m->trxs = NULL;
             m->committed = FALSE;
 
@@ -123,7 +121,7 @@ gcp_msg_t* gcp_msg(packet_info* pinfo, int o, gboolean keep_persistent_data) {
         m->committed = FALSE;
     }
 
-    if (CMP_ADDRESS(src, dst) < 0)  {
+    if (cmp_address(src, dst) < 0)  {
         lo_addr = src;
         hi_addr = dst;
     } else {
@@ -382,6 +380,9 @@ gcp_cmd_t* gcp_cmd(gcp_msg_t* m, gcp_trx_t* t, gcp_ctx_t* c, gcp_cmd_type_t type
     cmd->terms.last = &(cmd->terms);
     cmd->str = NULL;
     cmd->msg = m;
+    if ((type != GCP_CMD_NONE) && (!persistent)){
+        cmd->str = val_to_str_const(type, gcp_cmd_type, "Unknown");
+    }
     cmd->trx = t;
     cmd->ctx = c;
     cmd->error = 0;