diff options
38 files changed, 180 insertions, 171 deletions
diff --git a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c index ba50666b55..0de8f109ac 100644 --- a/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c +++ b/epan/dissectors/asn1/ansi_map/packet-ansi_map-template.c @@ -419,7 +419,7 @@ update_saved_invokedata(packet_info *pinfo, struct ansi_tcap_private_t *p_privat wmem_strdup(wmem_file_scope(), buf), ansi_map_saved_invokedata); - /*g_warning("Invoke Hash string %s pkt: %u",buf,pinfo->num);*/ + /*ws_warning("Invoke Hash string %s pkt: %u",buf,pinfo->num);*/ } } /* value strings */ @@ -4327,7 +4327,7 @@ find_saved_invokedata(asn1_ctx_t *actx, struct ansi_tcap_private_t *p_private_tc break; } - /*g_warning("Find Hash string %s pkt: %u",buf,actx->pinfo->num);*/ + /*ws_warning("Find Hash string %s pkt: %u",buf,actx->pinfo->num);*/ ansi_map_saved_invokedata = (struct ansi_map_invokedata_t *)wmem_map_lookup(TransactionId_table, buf); if(ansi_map_saved_invokedata){ OperationCode = ansi_map_saved_invokedata->opcode & 0xff; diff --git a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c index a221293797..9beff44eee 100644 --- a/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c +++ b/epan/dissectors/asn1/ansi_tcap/packet-ansi_tcap-template.c @@ -175,7 +175,7 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ wmem_strdup(wmem_file_scope(), buf), ansi_tcap_saved_invokedata); /* - g_warning("Tcap Invoke Hash string %s",buf); + ws_warning("Tcap Invoke Hash string %s",buf); */ } } diff --git a/epan/dissectors/asn1/h245/packet-h245-template.c b/epan/dissectors/asn1/h245/packet-h245-template.c index dfe16cc1c0..7fc0788ef9 100644 --- a/epan/dissectors/asn1/h245/packet-h245-template.c +++ b/epan/dissectors/asn1/h245/packet-h245-template.c @@ -335,7 +335,7 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha dummy_srtp_info = wmem_new0(wmem_file_scope(), struct srtp_info); } - /* DEBUG g_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel_lcl->media_addr.addr.type, upcoming_channel_lcl->media_addr.port ); + /* DEBUG ws_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel_lcl->media_addr.addr.type, upcoming_channel_lcl->media_addr.port ); */ if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0) { srtp_add_address(pinfo, PT_UDP, &upcoming_channel_lcl->media_addr.addr, diff --git a/epan/dissectors/asn1/nbap/nbap.cnf b/epan/dissectors/asn1/nbap/nbap.cnf index a886b8bc25..91aea66775 100644 --- a/epan/dissectors/asn1/nbap/nbap.cnf +++ b/epan/dissectors/asn1/nbap/nbap.cnf @@ -2435,7 +2435,7 @@ int i; #This guy should perhaps also be impletemented, hsdsch frame type 3 #.FN_BODY HSDSCH-Paging-System-InformationFDD /* - g_warning("HS-DSCH Type 3 NOT Implemented!"); + ws_warning("HS-DSCH Type 3 NOT Implemented!"); */ %(DEFAULT_BODY)s diff --git a/epan/dissectors/asn1/nbap/packet-nbap-template.c b/epan/dissectors/asn1/nbap/packet-nbap-template.c index b287688f75..662122489a 100644 --- a/epan/dissectors/asn1/nbap/packet-nbap-template.c +++ b/epan/dissectors/asn1/nbap/packet-nbap-template.c @@ -46,7 +46,7 @@ #define DEBUG_NBAP 0 #if DEBUG_NBAP #include <epan/to_str.h> -#define nbap_debug(...) g_warning(__VA_ARGS__) +#define nbap_debug(...) ws_warning(__VA_ARGS__) #else #define nbap_debug(...) #endif diff --git a/epan/dissectors/asn1/rrc/rrc.cnf b/epan/dissectors/asn1/rrc/rrc.cnf index df1122ec92..f0946fb854 100644 --- a/epan/dissectors/asn1/rrc/rrc.cnf +++ b/epan/dissectors/asn1/rrc/rrc.cnf @@ -1468,7 +1468,7 @@ if(state_dec >= 0 && state_dec <= 3) { switch(cn_domain){ case RRC_NAS_SYS_INFO_CS: /* - g_warning("Not implemented"); + ws_warning("Not implemented"); */ break; case RRC_NAS_SYS_INFO_PS: diff --git a/epan/dissectors/packet-ansi_map.c b/epan/dissectors/packet-ansi_map.c index 4866b018b8..d046c489d1 100644 --- a/epan/dissectors/packet-ansi_map.c +++ b/epan/dissectors/packet-ansi_map.c @@ -1207,7 +1207,7 @@ update_saved_invokedata(packet_info *pinfo, struct ansi_tcap_private_t *p_privat wmem_strdup(wmem_file_scope(), buf), ansi_map_saved_invokedata); - /*g_warning("Invoke Hash string %s pkt: %u",buf,pinfo->num);*/ + /*ws_warning("Invoke Hash string %s pkt: %u",buf,pinfo->num);*/ } } /* value strings */ @@ -15976,7 +15976,7 @@ find_saved_invokedata(asn1_ctx_t *actx, struct ansi_tcap_private_t *p_private_tc break; } - /*g_warning("Find Hash string %s pkt: %u",buf,actx->pinfo->num);*/ + /*ws_warning("Find Hash string %s pkt: %u",buf,actx->pinfo->num);*/ ansi_map_saved_invokedata = (struct ansi_map_invokedata_t *)wmem_map_lookup(TransactionId_table, buf); if(ansi_map_saved_invokedata){ OperationCode = ansi_map_saved_invokedata->opcode & 0xff; diff --git a/epan/dissectors/packet-ansi_tcap.c b/epan/dissectors/packet-ansi_tcap.c index a246c1a9cf..125127a3fd 100644 --- a/epan/dissectors/packet-ansi_tcap.c +++ b/epan/dissectors/packet-ansi_tcap.c @@ -266,7 +266,7 @@ save_invoke_data(packet_info *pinfo, proto_tree *tree _U_, tvbuff_t *tvb _U_){ wmem_strdup(wmem_file_scope(), buf), ansi_tcap_saved_invokedata); /* - g_warning("Tcap Invoke Hash string %s",buf); + ws_warning("Tcap Invoke Hash string %s",buf); */ } } diff --git a/epan/dissectors/packet-dcerpc-netlogon.c b/epan/dissectors/packet-dcerpc-netlogon.c index b381978aa9..a133d136c5 100644 --- a/epan/dissectors/packet-dcerpc-netlogon.c +++ b/epan/dissectors/packet-dcerpc-netlogon.c @@ -16,6 +16,7 @@ #include <epan/packet.h> #include <epan/expert.h> #include <wsutil/wsgcrypt.h> +#include <wsutil/wslog.h> /* for dissect_mscldap_string */ #include "packet-ldap.h" @@ -6829,14 +6830,14 @@ netlogon_dissect_netrserverauthenticate023_reply(tvbuff_t *tvb, int offset, /* Open the cipher */ err = gcry_cipher_open(&cipher_hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CFB8, 0); if (err != 0) { - g_warning("GCRY: cipher open %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: cipher open %s/%s\n", gcry_strsource(err), gcry_strerror(err)); break; } /* Set the initial value */ err = gcry_cipher_setiv(cipher_hd, iv, sizeof(iv)); if (err != 0) { - g_warning("GCRY: setiv %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: setiv %s/%s\n", gcry_strsource(err), gcry_strerror(err)); gcry_cipher_close(cipher_hd); break; } @@ -6844,7 +6845,7 @@ netlogon_dissect_netrserverauthenticate023_reply(tvbuff_t *tvb, int offset, /* Set the key */ err = gcry_cipher_setkey(cipher_hd, session_key, 16); if (err != 0) { - g_warning("GCRY: setkey %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: setkey %s/%s\n", gcry_strsource(err), gcry_strerror(err)); gcry_cipher_close(cipher_hd); break; } @@ -6854,7 +6855,7 @@ netlogon_dissect_netrserverauthenticate023_reply(tvbuff_t *tvb, int offset, (guint8 *)&calculated_cred, 8, (const guint8 *)&vars->server_challenge, 8); if (err != 0) { - g_warning("GCRY: encrypt %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: encrypt %s/%s\n", gcry_strsource(err), gcry_strerror(err)); gcry_cipher_close(cipher_hd); break; } @@ -7888,14 +7889,14 @@ static guint64 uncrypt_sequence_aes(guint8* session_key,guint64 checksum,guint64 /* Open the cipher */ err = gcry_cipher_open(&cipher_hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CFB8, 0); if (err != 0) { - g_warning("GCRY: cipher open %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: cipher open %s/%s\n", gcry_strsource(err), gcry_strerror(err)); return 0; } /* Set the initial value */ err = gcry_cipher_setiv(cipher_hd, iv, sizeof(iv)); if (err != 0) { - g_warning("GCRY: setiv %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: setiv %s/%s\n", gcry_strsource(err), gcry_strerror(err)); gcry_cipher_close(cipher_hd); return 0; } @@ -7903,14 +7904,14 @@ static guint64 uncrypt_sequence_aes(guint8* session_key,guint64 checksum,guint64 /* Set the key */ err = gcry_cipher_setkey(cipher_hd, session_key, 16); if (err != 0) { - g_warning("GCRY: setkey %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: setkey %s/%s\n", gcry_strsource(err), gcry_strerror(err)); gcry_cipher_close(cipher_hd); return 0; } err = gcry_cipher_decrypt(cipher_hd, (guint8*) &enc_seq, 8, NULL, 0); if (err != 0) { - g_warning("GCRY: encrypt %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: encrypt %s/%s\n", gcry_strsource(err), gcry_strerror(err)); gcry_cipher_close(cipher_hd); return 0; } @@ -7985,14 +7986,14 @@ static gcry_error_t prepare_decryption_cipher_aes(netlogon_auth_vars *vars, /* Open the cipher */ err = gcry_cipher_open(&cipher_hd, GCRY_CIPHER_AES128, GCRY_CIPHER_MODE_CFB8, 0); if (err != 0) { - g_warning("GCRY: cipher open %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: cipher open %s/%s\n", gcry_strsource(err), gcry_strerror(err)); return 0; } /* Set the initial value */ err = gcry_cipher_setiv(cipher_hd, iv, sizeof(iv)); if (err != 0) { - g_warning("GCRY: setiv %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: setiv %s/%s\n", gcry_strsource(err), gcry_strerror(err)); gcry_cipher_close(cipher_hd); return 0; } @@ -8000,7 +8001,7 @@ static gcry_error_t prepare_decryption_cipher_aes(netlogon_auth_vars *vars, /* Set the key */ err = gcry_cipher_setkey(cipher_hd, vars->encryption_key, 16); if (err != 0) { - g_warning("GCRY: setkey %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: setkey %s/%s\n", gcry_strsource(err), gcry_strerror(err)); gcry_cipher_close(cipher_hd); return 0; } @@ -8022,26 +8023,26 @@ static gcry_error_t prepare_decryption_cipher_strong(netlogon_auth_vars *vars, err = ws_hmac_buffer(GCRY_MD_MD5, tmp, zeros, 4, vars->encryption_key, 16); if (err != 0) { - g_warning("GCRY: GCRY_MD_MD5 %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: GCRY_MD_MD5 %s/%s\n", gcry_strsource(err), gcry_strerror(err)); return err; } err = ws_hmac_buffer(GCRY_MD_MD5, seal_key, (guint8*)&sequence, 8, tmp, HASH_MD5_LENGTH); if (err != 0) { - g_warning("GCRY: GCRY_MD_MD5 %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: GCRY_MD_MD5 %s/%s\n", gcry_strsource(err), gcry_strerror(err)); return err; } /* Open the cipher */ err = gcry_cipher_open(&cipher_hd, GCRY_CIPHER_ARCFOUR, GCRY_CIPHER_MODE_STREAM, 0); if (err != 0) { - g_warning("GCRY: cipher open %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: cipher open %s/%s\n", gcry_strsource(err), gcry_strerror(err)); return err; } /* Set the key */ err = gcry_cipher_setkey(cipher_hd, seal_key, 16); if (err != 0) { - g_warning("GCRY: setkey %s/%s\n", gcry_strsource(err), gcry_strerror(err)); + ws_warning("GCRY: setkey %s/%s\n", gcry_strsource(err), gcry_strerror(err)); gcry_cipher_close(cipher_hd); return err; } @@ -8103,7 +8104,7 @@ dissect_packet_data(tvbuff_t *tvb ,tvbuff_t *auth_tvb _U_, } err = prepare_decryption_cipher(vars, &cipher_hd); if (err != 0) { - g_warning("GCRY: prepare_decryption_cipher %s/%s\n", + ws_warning("GCRY: prepare_decryption_cipher %s/%s\n", gcry_strsource(err), gcry_strerror(err)); return NULL; } diff --git a/epan/dissectors/packet-dcerpc-nt.c b/epan/dissectors/packet-dcerpc-nt.c index cc4ec4cd3c..1b994e53bb 100644 --- a/epan/dissectors/packet-dcerpc-nt.c +++ b/epan/dissectors/packet-dcerpc-nt.c @@ -775,7 +775,7 @@ void dcerpc_store_polhnd_name(e_ctx_hnd *policy_hnd, packet_info *pinfo, if (pol->name && name) { #ifdef DEBUG_HASH_COLL if (strcmp(pol->name, name) != 0) - g_warning("dcerpc_smb: pol_hash name collision %s/%s\n", value->name, name); + ws_warning("dcerpc_smb: pol_hash name collision %s/%s\n", value->name, name); #endif /* pol->name is wmem_file_scope() allocated, don't free it now */ } diff --git a/epan/dissectors/packet-dcom.c b/epan/dissectors/packet-dcom.c index 85fec9638d..b2e1636e43 100644 --- a/epan/dissectors/packet-dcom.c +++ b/epan/dissectors/packet-dcom.c @@ -245,17 +245,17 @@ void dcom_interface_dump(void) { for(machines = dcom_machines; machines != NULL; machines = g_list_next(machines)) { machine = (dcom_machine_t *)machines->data; - /*g_warning("Machine(#%4u): IP:%s", machine->first_packet, address_to_str(wmem_packet_scope(), &machine->ip));*/ + /*ws_warning("Machine(#%4u): IP:%s", machine->first_packet, address_to_str(wmem_packet_scope(), &machine->ip));*/ for(objects = machine->objects; objects != NULL; objects = g_list_next(objects)) { object = (dcom_object_t *)objects->data; - /*g_warning(" Object(#%4u): OID:0x%" G_GINT64_MODIFIER "x private:%p", object->first_packet, object->oid, object->private_data);*/ + /*ws_warning(" Object(#%4u): OID:0x%" G_GINT64_MODIFIER "x private:%p", object->first_packet, object->oid, object->private_data);*/ for(interfaces = object->interfaces; interfaces != NULL; interfaces = g_list_next(interfaces)) { interf = (dcom_interface_t *)interfaces->data; - /*g_warning(" Interface(#%4u): iid:%s", + /*ws_warning(" Interface(#%4u): iid:%s", interf->first_packet, guids_resolve_guid_to_str(&interf->iid)); - g_warning(" ipid:%s", guids_resolve_guid_to_str(&interf->ipid));*/ + ws_warning(" ipid:%s", guids_resolve_guid_to_str(&interf->ipid));*/ } } } @@ -300,7 +300,7 @@ dcom_interface_t *dcom_interface_new(packet_info *pinfo, const address *addr, e_ } if(oxid == 0 || oid == 0) { - /*g_warning("interface_new#%u", pinfo->num);*/ + /*ws_warning("interface_new#%u", pinfo->num);*/ interf = wmem_new(wmem_file_scope(), dcom_interface_t); interf->parent = NULL; diff --git a/epan/dissectors/packet-diameter.c b/epan/dissectors/packet-diameter.c index ac41996628..78e4b87924 100644 --- a/epan/dissectors/packet-diameter.c +++ b/epan/dissectors/packet-diameter.c @@ -838,7 +838,7 @@ dissect_diameter_avp(diam_ctx_t *c, tvbuff_t *tvb, int offset, diam_sub_dis_t *d value_string *vendor_avp_vs = VALUE_STRING_EXT_VS_P(vendor->vs_avps_ext); gint i = 0; while (vendor_avp_vs[i].strptr != NULL) { - g_warning("%u %s", vendor_avp_vs[i].value, vendor_avp_vs[i].strptr); + ws_warning("%u %s", vendor_avp_vs[i].value, vendor_avp_vs[i].strptr); i++; } } diff --git a/epan/dissectors/packet-epl-profile-parser.c b/epan/dissectors/packet-epl-profile-parser.c index 108516aba0..6168685cc5 100644 --- a/epan/dissectors/packet-epl-profile-parser.c +++ b/epan/dissectors/packet-epl-profile-parser.c @@ -29,6 +29,7 @@ #include <wsutil/strtoi.h> #include <wsutil/str_util.h> +#include <wsutil/wslog.h> #include <epan/wmem/wmem.h> #if defined HAVE_LIBXML2 @@ -201,7 +202,7 @@ epl_eds_load(struct profile *profile, const char *eds_file) /* Load EDS document */ if (!g_key_file_load_from_file(gkf, eds_file, G_KEY_FILE_NONE, &err)){ - g_log(NULL, G_LOG_LEVEL_WARNING, "Error: unable to parse file \"%s\"\n", eds_file); + ws_log(NULL, LOG_LEVEL_WARNING, "Error: unable to parse file \"%s\"\n", eds_file); profile = NULL; goto cleanup; } @@ -311,7 +312,7 @@ epl_xdd_load(struct profile *profile, const char *xml_file) doc = xmlParseFile(xml_file); if (!doc) { - g_log(NULL, G_LOG_LEVEL_WARNING, "Error: unable to parse file \"%s\"\n", xml_file); + ws_log(NULL, LOG_LEVEL_WARNING, "Error: unable to parse file \"%s\"\n", xml_file); profile = NULL; goto cleanup; } @@ -321,7 +322,7 @@ epl_xdd_load(struct profile *profile, const char *xml_file) xpathCtx = xmlXPathNewContext(doc); if(!xpathCtx) { - g_log(NULL, G_LOG_LEVEL_WARNING, "Error: unable to create new XPath context\n"); + ws_log(NULL, LOG_LEVEL_WARNING, "Error: unable to create new XPath context\n"); profile = NULL; goto cleanup; } @@ -331,7 +332,7 @@ epl_xdd_load(struct profile *profile, const char *xml_file) { if(xmlXPathRegisterNs(xpathCtx, ns->prefix, ns->href) != 0) { - g_log(NULL, G_LOG_LEVEL_WARNING, "Error: unable to register NS with prefix=\"%s\" and href=\"%s\"\n", ns->prefix, ns->href); + ws_log(NULL, LOG_LEVEL_WARNING, "Error: unable to register NS with prefix=\"%s\" and href=\"%s\"\n", ns->prefix, ns->href); profile = NULL; goto cleanup; } @@ -348,7 +349,7 @@ epl_xdd_load(struct profile *profile, const char *xml_file) xmlXPathObjectPtr xpathObj = xmlXPathEvalExpression(xpath->expr, xpathCtx); if (!xpathObj || !xpathObj->nodesetval) { - g_log(NULL, G_LOG_LEVEL_WARNING, "Error: unable to evaluate xpath expression \"%s\"\n", xpath->expr); + ws_log(NULL, LOG_LEVEL_WARNING, "Error: unable to evaluate xpath expression \"%s\"\n", xpath->expr); xmlXPathFreeObject(xpathObj); profile = NULL; goto cleanup; @@ -433,7 +434,7 @@ populate_datatype_list(xmlNodeSetPtr nodes, void *_profile) const struct epl_datatype *ptr = epl_type_to_hf((const char*)subnode->name); if (!ptr) { - g_log(NULL, G_LOG_LEVEL_INFO, "Skipping unknown type '%s'\n", subnode->name); + ws_log(NULL, LOG_LEVEL_INFO, "Skipping unknown type '%s'\n", subnode->name); continue; } type = g_new(struct datatype, 1); @@ -552,7 +553,7 @@ populate_object_list(xmlNodeSetPtr nodes, void *_profile) if (subobj.info.value && epl_profile_object_mapping_add( profile, obj->info.idx, (guint8)subobj.info.idx, subobj.info.value)) { - g_log(NULL, G_LOG_LEVEL_INFO, + ws_log(NULL, LOG_LEVEL_INFO, "Loaded mapping from XDC %s:%s", obj->info.name, subobj.info.name); } } diff --git a/epan/dissectors/packet-epl.c b/epan/dissectors/packet-epl.c index ecb1149554..db1b78523d 100644 --- a/epan/dissectors/packet-epl.c +++ b/epan/dissectors/packet-epl.c @@ -71,6 +71,7 @@ #include <wsutil/strtoi.h> #include <wsutil/file_util.h> #include <wsutil/report_message.h> +#include <wsutil/wslog.h> #include <string.h> #ifdef HAVE_LIBXML2 @@ -6593,7 +6594,7 @@ device_profile_parse_uat(void) wmem_map_insert(epl_profiles_by_device, GUINT_TO_POINTER(profile->id), profile); profile->parent_map = epl_profiles_by_device; - g_log(NULL, G_LOG_LEVEL_INFO, "Loading %s\n", profile->path); + ws_log(NULL, LOG_LEVEL_INFO, "Loading %s\n", profile->path); } } @@ -6676,7 +6677,7 @@ nodeid_profile_parse_uat(void) wmem_map_insert(epl_profiles_by_address, &profile->node_addr, profile); profile->parent_map = epl_profiles_by_address; } - g_log(NULL, G_LOG_LEVEL_INFO, "Loading %s\n", profile->path); + ws_log(NULL, LOG_LEVEL_INFO, "Loading %s\n", profile->path); } } diff --git a/epan/dissectors/packet-f5ethtrailer.c b/epan/dissectors/packet-f5ethtrailer.c index ed77dfd922..ece283bc1d 100644 --- a/epan/dissectors/packet-f5ethtrailer.c +++ b/epan/dissectors/packet-f5ethtrailer.c @@ -204,6 +204,7 @@ Notes: #define F5FILEINFOTAP_SRC #include "packet-f5ethtrailer.h" #undef F5FILEINFOTAP_SRC +#include <wsutil/wslog.h> /* Wireshark ID of the F5ETHTRAILER protocol */ static int proto_f5ethtrailer = -1; @@ -3553,19 +3554,19 @@ proto_init_f5ethtrailer(void) error_string = register_tap_listener( "ip", &tap_ip_enabled, NULL, TL_REQUIRES_NOTHING, NULL, ip_tap_pkt, NULL, NULL); if (error_string) { - g_warning("Unable to register tap \"ip\" for f5ethtrailer: %s", error_string->str); + ws_warning("Unable to register tap \"ip\" for f5ethtrailer: %s", error_string->str); g_string_free(error_string, TRUE); } error_string = register_tap_listener( "ipv6", &tap_ipv6_enabled, NULL, TL_REQUIRES_NOTHING, NULL, ipv6_tap_pkt, NULL, NULL); if (error_string) { - g_warning("Unable to register tap \"ipv6\" for f5ethtrailer: %s", error_string->str); + ws_warning("Unable to register tap \"ipv6\" for f5ethtrailer: %s", error_string->str); g_string_free(error_string, TRUE); } error_string = register_tap_listener( "tcp", &tap_tcp_enabled, NULL, TL_REQUIRES_NOTHING, NULL, tcp_tap_pkt, NULL, NULL); if (error_string) { - g_warning("Unable to register tap \"tcp\" for f5ethtrailer: %s", error_string->str); + ws_warning("Unable to register tap \"tcp\" for f5ethtrailer: %s", error_string->str); g_string_free(error_string, TRUE); } } diff --git a/epan/dissectors/packet-h223.c b/epan/dissectors/packet-h223.c index 2c8f0548d2..fe75c78052 100644 --- a/epan/dissectors/packet-h223.c +++ b/epan/dissectors/packet-h223.c @@ -22,6 +22,7 @@ #include <epan/show_exception.h> #include <epan/asn1.h> #include <wsutil/bitswap.h> +#include <wsutil/wslog.h> #include "packet-h245.h" #include "packet-iax2.h" @@ -399,7 +400,7 @@ init_logical_channel( guint32 start_frame, h223_call_info* call_info, int vc, in if( subcircuit == NULL ) { subcircuit = conversation_new_by_id( start_frame, ENDPOINT_H223, circuit_id, 0 ); #ifdef DEBUG_H223 - g_debug("%d: Created new circuit %d for call %p VC %d", start_frame, circuit_id, call_info, vc); + ws_debug("%d: Created new circuit %d for call %p VC %d", start_frame, circuit_id, call_info, vc); #endif vc_info = h223_vc_info_new( call_info ); conversation_add_proto_data( subcircuit, proto_h223, vc_info ); @@ -453,7 +454,7 @@ find_or_create_call_info_circ(packet_info * pinfo, endpoint_type etype, guint32 datax = create_call_info(pinfo->num); #ifdef DEBUG_H223 - g_debug("%u: Created new call %p for circuit %p ctype %d, id %u", + ws_debug("%u: Created new call %p for circuit %p ctype %d, id %u", pinfo->num, datax, circ, type, circuit_id); #endif conversation_add_proto_data(circ, proto_h223, datax); @@ -499,7 +500,7 @@ find_or_create_call_info_conv(packet_info * pinfo) if(datax != NULL) { #ifdef DEBUG_H223 - g_debug("%u: Identified conv %p as reverse of conv %p with call %p and type=%u src=%u.%u.%u.%u:%u dst=%u.%u.%u.%u:%u", + ws_debug("%u: Identified conv %p as reverse of conv %p with call %p and type=%u src=%u.%u.%u.%u:%u dst=%u.%u.%u.%u:%u", pinfo->num, conv, conv2, datax, pinfo->ptype, pinfo->dst.data[0], pinfo->dst.data[1], pinfo->dst.data[2], pinfo->dst.data[3], pinfo->destport, @@ -516,7 +517,7 @@ find_or_create_call_info_conv(packet_info * pinfo) datax = create_call_info(pinfo->num); #ifdef DEBUG_H223 - g_debug("%u: Created new call %p for conv %p type=%u src=%u.%u.%u.%u:%u dst=%u.%u.%u.%u:%u", + ws_debug("%u: Created new call %p for conv %p type=%u src=%u.%u.%u.%u:%u dst=%u.%u.%u.%u:%u", pinfo->num, datax, conv, pinfo->ptype, pinfo->src.data[0], pinfo->src.data[1], pinfo->src.data[2], pinfo->src.data[3], pinfo->srcport, @@ -738,7 +739,7 @@ dissect_mux_sdu_fragment(tvbuff_t *volatile next_tvb, packet_info *pinfo, vc_tree = proto_item_add_subtree (vc_item, ett_h223_mux_vc); if( subcircuit == NULL ) { - g_message( "Frame %d: Subcircuit id %d not found for call %p VC %d", pinfo->num, + ws_message( "Frame %d: Subcircuit id %d not found for call %p VC %d", pinfo->num, circuit_id, (void *)call_info, vc ); } else { vc_info = (h223_vc_info *)conversation_get_proto_data(subcircuit, proto_h223); @@ -760,14 +761,14 @@ dissect_mux_sdu_fragment(tvbuff_t *volatile next_tvb, packet_info *pinfo, if(frag == NULL ) { #ifdef DEBUG_H223 - g_debug("%d: New H.223 VC fragment: Parent circuit %d; subcircuit %d; offset %d; len %d, end %d", + ws_debug("%d: New H.223 VC fragment: Parent circuit %d; subcircuit %d; offset %d; len %d, end %d", pinfo->num, orig_circuit, circuit_id, pkt_offset, tvb_reported_length(next_tvb), end_of_mux_sdu); #endif frag = stream_add_frag(substream,pinfo->num,pkt_offset, next_tvb,pinfo,!end_of_mux_sdu); } else { #ifdef DEBUG_H223 - g_debug("%d: Found H.223 VC fragment: Parent circuit %d; subcircuit %d; offset %d; len %d, end %d", + ws_debug("%d: Found H.223 VC fragment: Parent circuit %d; subcircuit %d; offset %d; len %d, end %d", pinfo->num, orig_circuit, circuit_id, pkt_offset, tvb_reported_length(next_tvb), end_of_mux_sdu); #endif } @@ -939,7 +940,7 @@ dissect_mux_pdu( tvbuff_t *tvb, packet_info *pinfo, guint32 pkt_offset, proto_tree *pdu_tree = NULL; #ifdef DEBUG_H223_FRAGMENTATION - g_debug("%u: dissecting complete H.223 MUX-PDU, pkt_offset %u, len %u", + ws_debug("%u: dissecting complete H.223 MUX-PDU, pkt_offset %u, len %u", pinfo->num, pkt_offset, tvb_reported_length(tvb)); #endif @@ -1177,7 +1178,7 @@ dissect_mux_pdu_fragment( tvbuff_t *tvb, guint32 start_offset, #ifdef DEBUG_H223_FRAGMENTATION - g_debug("%d: dissecting H.223 PDU, start_offset %u, %u bytes left", + ws_debug("%d: dissecting H.223 PDU, start_offset %u, %u bytes left", pinfo->num,start_offset, tvb_reported_length_remaining( tvb, start_offset )); #endif @@ -1214,13 +1215,13 @@ dissect_mux_pdu_fragment( tvbuff_t *tvb, guint32 start_offset, /* we haven't found the closing hdlc yet, but we don't know how * much more we need */ #ifdef DEBUG_H223_FRAGMENTATION - g_debug("\tBailing, requesting more bytes"); + ws_debug("\tBailing, requesting more bytes"); #endif return 0; } else { guint32 needed = pdu_minlen-(offset-start_offset); #ifdef DEBUG_H223_FRAGMENTATION - g_debug("\tBailing, requesting %i-%i=%u more bytes", pdu_minlen,(offset-start_offset),needed); + ws_debug("\tBailing, requesting %i-%i=%u more bytes", pdu_minlen,(offset-start_offset),needed); #endif return - (gint) needed; } diff --git a/epan/dissectors/packet-h245.c b/epan/dissectors/packet-h245.c index ca9eff2652..c31f2fb168 100644 --- a/epan/dissectors/packet-h245.c +++ b/epan/dissectors/packet-h245.c @@ -466,7 +466,7 @@ static void h245_setup_channels(packet_info *pinfo, channel_info_t *upcoming_cha dummy_srtp_info = wmem_new0(wmem_file_scope(), struct srtp_info); } - /* DEBUG g_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel_lcl->media_addr.addr.type, upcoming_channel_lcl->media_addr.port ); + /* DEBUG ws_warning("h245_setup_channels media_addr.addr.type %u port %u",upcoming_channel_lcl->media_addr.addr.type, upcoming_channel_lcl->media_addr.port ); */ if (upcoming_channel_lcl->media_addr.addr.type!=AT_NONE && upcoming_channel_lcl->media_addr.port!=0) { srtp_add_address(pinfo, PT_UDP, &upcoming_channel_lcl->media_addr.addr, diff --git a/epan/dissectors/packet-http2.c b/epan/dissectors/packet-http2.c index 85574a3669..ed9d8fb42e 100644 --- a/epan/dissectors/packet-http2.c +++ b/epan/dissectors/packet-http2.c @@ -50,6 +50,7 @@ #include "wsutil/pint.h" #include "wsutil/strtoi.h" #include "wsutil/str_util.h" +#include <wsutil/wslog.h> #ifdef HAVE_NGHTTP2 #define http2_header_repr_type_VALUE_STRING_LIST(XXX) \ @@ -1743,7 +1744,7 @@ fix_partial_header_dissection_support(nghttp2_hd_inflater *hd_inflater, gboolean dummy_header, dummy_header_size, i == 0); if (rv != dummy_header_size) { - g_log(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, + ws_log(WS_LOG_DOMAIN, LOG_LEVEL_WARNING, "unexpected decompression state: %d != %d", rv, dummy_header_size); break; diff --git a/epan/dissectors/packet-iax2.c b/epan/dissectors/packet-iax2.c index f45ec6e966..f5575e55f2 100644 --- a/epan/dissectors/packet-iax2.c +++ b/epan/dissectors/packet-iax2.c @@ -671,7 +671,7 @@ static gint iax_circuit_equal(gconstpointer v, gconstpointer w) v1->port == v2->port && v1->callno== v2->callno); #ifdef DEBUG_HASHING - g_debug("+++ Comparing for equality: %s, %s: %u", key_to_str(v1), key_to_str(v2), result); + ws_debug("+++ Comparing for equality: %s, %s: %u", key_to_str(v1), key_to_str(v2), result); #endif return result; @@ -689,7 +689,7 @@ static guint iax_circuit_hash(gconstpointer v) hash_val += (guint)(key->callno); #ifdef DEBUG_HASHING - g_debug("+++ Hashing key: %s, result %#x", key_to_str(key), hash_val); + ws_debug("+++ Hashing key: %s, result %#x", key_to_str(key), hash_val); #endif return (guint)hash_val; @@ -731,7 +731,7 @@ static guint iax_circuit_lookup(const address *address_p, g_hash_table_insert(iax_circuit_hashtab, new_key, circuit_id_p); #ifdef DEBUG_HASHING - g_debug("Created new circuit id %u for node %s", *circuit_id_p, key_to_str(new_key)); + ws_debug("Created new circuit id %u for node %s", *circuit_id_p, key_to_str(new_key)); #endif } @@ -871,7 +871,7 @@ static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item * if (!dst_conv) { #ifdef DEBUG_HASHING - g_debug("++ destination circuit not found, must have missed NEW packet"); + ws_debug("++ destination circuit not found, must have missed NEW packet"); #endif if (reversed_p) *reversed_p = FALSE; @@ -879,7 +879,7 @@ static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item * } #ifdef DEBUG_HASHING - g_debug("++ found destination circuit"); + ws_debug("++ found destination circuit"); #endif iax_call = (iax_call_data *)conversation_get_proto_data(dst_conv, proto_iax2); @@ -890,7 +890,7 @@ static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item * if (is_forward_circuit(dst_circuit_id, iax_call)) { #ifdef DEBUG_HASHING - g_debug("++ destination circuit matches forward_circuit_id of call, " + ws_debug("++ destination circuit matches forward_circuit_id of call, " "therefore packet is reversed"); #endif @@ -901,13 +901,13 @@ static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item * doesn't have a reverse circuit associated with it. create one now. */ #ifdef DEBUG_HASHING - g_debug("++ reverse_circuit_id of call is zero, need to create a " + ws_debug("++ reverse_circuit_id of call is zero, need to create a " "new reverse circuit for this call"); #endif iax2_new_circuit_for_call(pinfo, item, src_circuit_id, framenum, iax_call, TRUE); #ifdef DEBUG_HASHING - g_debug("++ done"); + ws_debug("++ done"); #endif } else if (!is_reverse_circuit(src_circuit_id, iax_call)) { expert_add_info_format(pinfo, item, &ei_iax_circuit_id_conflict, @@ -920,7 +920,7 @@ static iax_call_data *iax_lookup_call_from_dest(packet_info *pinfo, proto_item * } } else if (is_reverse_circuit(dst_circuit_id, iax_call)) { #ifdef DEBUG_HASHING - g_debug("++ destination circuit matches reverse_circuit_id of call, " + ws_debug("++ destination circuit matches reverse_circuit_id of call, " "therefore packet is forward"); #endif @@ -963,7 +963,7 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo, #ifdef DEBUG_HASHING srcstr = address_to_str(NULL, &pinfo->src); dststr = address_to_str(NULL, &pinfo->dst); - g_debug("++ iax_lookup_circuit_details: Looking up circuit for frame %u, " + ws_debug("++ iax_lookup_circuit_details: Looking up circuit for frame %u, " "from {%s:%u:%u} to {%s:%u:%u}", pinfo->num, srcstr, pinfo->srcport, scallno, dststr, pinfo->destport, dcallno); @@ -981,7 +981,7 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo, if (dcallno != 0) { guint dst_circuit_id; #ifdef DEBUG_HASHING - g_debug("++ dcallno non-zero, looking up destination circuit"); + ws_debug("++ dcallno non-zero, looking up destination circuit"); #endif dst_circuit_id = iax_circuit_lookup(&pinfo->dst, pinfo->ptype, @@ -1025,9 +1025,9 @@ static iax_call_data *iax_lookup_call( packet_info *pinfo, #ifdef DEBUG_HASHING if (iax_call) { - g_debug("++ Found call for packet: id %u, reversed=%c", iax_call->forward_circuit_ids[0], reversed?'1':'0'); + ws_debug("++ Found call for packet: id %u, reversed=%c", iax_call->forward_circuit_ids[0], reversed?'1':'0'); } else { - g_debug("++ Call not found. Must have missed the NEW packet?"); + ws_debug("++ Call not found. Must have missed the NEW packet?"); } #endif @@ -1053,7 +1053,7 @@ static iax_call_data *iax_new_call( packet_info *pinfo, static const nstime_t millisecond = NSTIME_INIT_SECS_MSECS(0, 1); #ifdef DEBUG_HASHING - g_debug("+ new_circuit: Handling NEW packet, frame %u", pinfo->num); + ws_debug("+ new_circuit: Handling NEW packet, frame %u", pinfo->num); #endif circuit_id = iax_circuit_lookup(&pinfo->src, pinfo->ptype, @@ -2295,7 +2295,7 @@ static void process_iax_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, iax_call_data *iax_call = iax_packet -> call_data; #ifdef DEBUG_DESEGMENT - g_debug("calling process_iax_pdu; len = %u", tvb_reported_length(tvb)); + ws_debug("calling process_iax_pdu; len = %u", tvb_reported_length(tvb)); #endif if (!video && iax_call && iax_call->subdissector) { @@ -2321,7 +2321,7 @@ static void process_iax_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, } #ifdef DEBUG_DESEGMENT - g_debug("called process_iax_pdu; pinfo->desegment_len=%u; pinfo->desegment_offset=%u", + ws_debug("called process_iax_pdu; pinfo->desegment_len=%u; pinfo->desegment_offset=%u", pinfo->desegment_len, pinfo->desegment_offset); #endif } @@ -2344,7 +2344,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr pinfo->desegment_len = 0; #ifdef DEBUG_DESEGMENT - g_debug("dissecting packet %u", pinfo->num); + ws_debug("dissecting packet %u", pinfo->num); #endif dirdata = &(iax_call->dirdata[!!(iax_packet->reversed)]); @@ -2358,7 +2358,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr gboolean complete; #ifdef DEBUG_DESEGMENT - g_debug("visited: %i; c_f_b: %u; hash: %u->%u", pinfo->fd->visited?1:0, + ws_debug("visited: %i; c_f_b: %u; hash: %u->%u", pinfo->fd->visited?1:0, dirdata->current_frag_bytes, pinfo->num, dirdata->current_frag_id); #endif @@ -2372,7 +2372,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr dirdata->current_frag_bytes += frag_len; complete = dirdata->current_frag_bytes > tot_len; #ifdef DEBUG_DESEGMENT - g_debug("hash: %u->%u; frag_offset: %u; c_f_b: %u; totlen: %u", + ws_debug("hash: %u->%u; frag_offset: %u; c_f_b: %u; totlen: %u", pinfo->num, fid, frag_offset, dirdata->current_frag_bytes, tot_len); #endif } else { @@ -2474,7 +2474,7 @@ static void desegment_iax(tvbuff_t *tvb, packet_info *pinfo, proto_tree *iax2_tr tvb, deseg_offset, pinfo, fid, NULL, 0, frag_len, TRUE); #ifdef DEBUG_DESEGMENT - g_debug("Start offset of undissected bytes: %u; " + ws_debug("Start offset of undissected bytes: %u; " "Bytes remaining in this segment: %u; min required bytes: %u\n", deseg_offset, frag_len, frag_len + pinfo->desegment_len); #endif diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 25a265a31b..81acc54617 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -5180,7 +5180,7 @@ dissect_isup_application_transport_parameter(tvbuff_t *parameter_tvb, packet_inf */ if (isup_apm_desegment) { if ((si_and_apm_seg_ind != 0xc0) && ((si_and_apm_seg_ind & H_8BIT_MASK)!=0x80)) { - /* debug g_warning("got here Frame %u", pinfo->num); */ + /* debug ws_warning("got here Frame %u", pinfo->num); */ /* Segmented message */ save_fragmented = pinfo->fragmented; pinfo->fragmented = TRUE; diff --git a/epan/dissectors/packet-jxta.c b/epan/dissectors/packet-jxta.c index 1e91a4ca7b..a19491eca5 100644 --- a/epan/dissectors/packet-jxta.c +++ b/epan/dissectors/packet-jxta.c @@ -19,7 +19,7 @@ #include "config.h" -#define G_LOG_DOMAIN "jxta" +#define WS_LOG_DOMAIN "jxta" #include <epan/packet.h> #include <epan/conversation.h> @@ -285,7 +285,7 @@ static gboolean dissect_jxta_UDP_heur(tvbuff_t * tvb, packet_info * pinfo, proto save_desegment_len = pinfo->desegment_len; ret = dissect_jxta_udp(tvb, pinfo, tree, NULL); - /* g_message( "%d Heuristic UDP Dissection : %d", pinfo->num, ret ); */ + /* ws_message( "%d Heuristic UDP Dissection : %d", pinfo->num, ret ); */ if (ret < 0) { /* @@ -335,7 +335,7 @@ static gboolean dissect_jxta_TCP_heur(tvbuff_t * tvb, packet_info * pinfo, proto save_desegment_len = pinfo->desegment_len; ret = dissect_jxta_stream(tvb, pinfo, tree, NULL); - /* g_message( "%d Heuristic TCP Dissection : %d", pinfo->num, ret ); */ + /* ws_message( "%d Heuristic TCP Dissection : %d", pinfo->num, ret ); */ if (ret < 0) { /* @@ -395,7 +395,7 @@ static gboolean dissect_jxta_SCTP_heur(tvbuff_t * tvb, packet_info * pinfo, prot save_desegment_len = pinfo->desegment_len; ret = dissect_jxta_stream(tvb, pinfo, tree, NULL); - /* g_message( "%d Heuristic SCTP Dissection : %d", pinfo->num, ret ); */ + /* ws_message( "%d Heuristic SCTP Dissection : %d", pinfo->num, ret ); */ if (ret < 0) { /* @@ -495,7 +495,7 @@ static int dissect_jxta_udp(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tr } if ((needed > 0) && gDESEGMENT && pinfo->can_desegment) { - /* g_message( "UDP requesting %d more bytes", needed ); */ + /* ws_message( "UDP requesting %d more bytes", needed ); */ pinfo->desegment_offset = 0; pinfo->desegment_len = needed; return -needed; @@ -560,7 +560,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * proto_item *jxta_tree_item = NULL; proto_tree *jxta_tree = NULL; - /* g_message("Dissecting%s : %d", (NULL != tree) ? " for display" : "", pinfo->num ); */ + /* ws_message("Dissecting%s : %d", (NULL != tree) ? " for display" : "", pinfo->num ); */ if (available < sizeof(JXTA_WELCOME_MSG_SIG)) { needed = (gint) (sizeof(JXTA_WELCOME_MSG_SIG) - available); @@ -631,7 +631,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * return 0; } - /* g_message("%d Tpt %s:%d -> %s:%d tvb len=%d\n\t%s %d", pinfo->num, + /* ws_message("%d Tpt %s:%d -> %s:%d tvb len=%d\n\t%s %d", pinfo->num, address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport, address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport, tvb_reported_length_remaining(tvb, 0), @@ -659,13 +659,13 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * /* Use our source and destination addresses if we have them */ if (NULL != peer_conversation) { - /* g_message("%d Tpt %s:%d -> %s:%d", pinfo->num, + /* ws_message("%d Tpt %s:%d -> %s:%d", pinfo->num, address_to_str(wmem_packet_scope(), &tpt_conv_data->initiator_tpt_address), tpt_conv_data->initiator_tpt_port, address_to_str(wmem_packet_scope(), &tpt_conv_data->receiver_tpt_address), tpt_conv_data->receiver_tpt_port); */ if (addresses_equal(&pinfo->src, &tpt_conv_data->initiator_tpt_address) && tpt_conv_data->initiator_tpt_port == pinfo->srcport) { - /* g_message("%d From initiator : %s -> %s ", pinfo->num, + /* ws_message("%d From initiator : %s -> %s ", pinfo->num, address_to_str(wmem_packet_scope(), &tpt_conv_data->initiator_address), address_to_str(wmem_packet_scope(), &tpt_conv_data->receiver_address)); */ copy_address_shallow(&pinfo->src, &tpt_conv_data->initiator_address); @@ -675,7 +675,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * pinfo->ptype = PT_NONE; } else if (addresses_equal(&pinfo->src, &tpt_conv_data->receiver_tpt_address) && tpt_conv_data->receiver_tpt_port == pinfo->srcport) { - /* g_message("%d From receiver : %s -> %s ", pinfo->num, + /* ws_message("%d From receiver : %s -> %s ", pinfo->num, address_to_str(wmem_packet_scope(), &tpt_conv_data->receiver_address), address_to_str(wmem_packet_scope(), &tpt_conv_data->initiator_address)); */ copy_address_shallow(&pinfo->src, &tpt_conv_data->receiver_address); @@ -684,7 +684,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * pinfo->destport = 0; pinfo->ptype = PT_NONE; } else { - /* g_message("%d Nothing matches %s:%d -> %s:%d", pinfo->num, + /* ws_message("%d Nothing matches %s:%d -> %s:%d", pinfo->num, address_to_str(wmem_packet_scope(), &pinfo->src), pinfo->srcport, address_to_str(wmem_packet_scope(), &pinfo->dst), pinfo->destport); */ } @@ -704,7 +704,7 @@ static int dissect_jxta_stream(tvbuff_t * tvb, packet_info * pinfo, proto_tree * Common_Exit: if ((needed > 0) && gDESEGMENT && pinfo->can_desegment) { - /* g_message( "Stream requesting %d more bytes", needed ); */ + /* ws_message( "Stream requesting %d more bytes", needed ); */ pinfo->desegment_offset = offset; pinfo->desegment_len = needed; return -needed; @@ -1060,7 +1060,7 @@ static int dissect_jxta_message_framing(tvbuff_t * tvb, packet_info * pinfo, pro } while (TRUE); if ((needed > 0) && gDESEGMENT && pinfo->can_desegment) { - /* g_message( "Framing requesting %d more bytes", needed ); */ + /* ws_message( "Framing requesting %d more bytes", needed ); */ pinfo->desegment_offset = 0; pinfo->desegment_len = needed; return -needed; @@ -1273,7 +1273,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree * probably be expert info, not a g_warning. Pending confirmation * just comment it out since a g_warning is definitely the * wrong thing to do. - * g_warning( "Failure processing message element #%d of %d of frame %d", each_elem, elem_count, pinfo->num ); + * ws_warning( "Failure processing message element #%d of %d of frame %d", each_elem, elem_count, pinfo->num ); */ return 0; } @@ -1294,11 +1294,11 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree complete_messages++; - /* g_message( "%d Scanned message #%d: ", pinfo->num, complete_messages ); */ + /* ws_message( "%d Scanned message #%d: ", pinfo->num, complete_messages ); */ } if ((needed > 0) && gDESEGMENT && pinfo->can_desegment) { - /* g_message("Frame %d: Message requesting %d more bytes", pinfo->num, needed); */ + /* ws_message("Frame %d: Message requesting %d more bytes", pinfo->num, needed); */ pinfo->desegment_offset = 0; pinfo->desegment_len = needed; return -needed; @@ -1440,7 +1440,7 @@ static int dissect_jxta_message(tvbuff_t * tvb, packet_info * pinfo, proto_tree } if( tree ) { - /* g_message( "%d tvb offset : %d tree offset : %d", pinfo->num, offset, tree_offset ); */ + /* ws_message( "%d tvb offset : %d tree offset : %d", pinfo->num, offset, tree_offset ); */ DISSECTOR_ASSERT(tree_offset == offset); } @@ -1605,7 +1605,7 @@ static int dissect_jxta_message_element_1(tvbuff_t * tvb, packet_info * pinfo, p } if ((needed > 0) && gDESEGMENT && pinfo->can_desegment) { - /* g_message( "Element1 requesting %d more bytes", needed ); */ + /* ws_message( "Element1 requesting %d more bytes", needed ); */ pinfo->desegment_offset = 0; pinfo->desegment_len = needed; return -needed; @@ -1862,7 +1862,7 @@ static int dissect_jxta_message_element_2(tvbuff_t * tvb, packet_info * pinfo, p } if ((needed > 0) && gDESEGMENT && pinfo->can_desegment) { - /* g_message( "Element2 requesting %d more bytes", needed ); */ + /* ws_message( "Element2 requesting %d more bytes", needed ); */ pinfo->desegment_offset = 0; pinfo->desegment_len = needed; return -needed; @@ -2054,7 +2054,7 @@ static int dissect_media( const gchar* fullmediatype, tvbuff_t * tvb, packet_inf dissected = dissector_try_string(media_type_dissector_table, mediatype, tvb, pinfo, tree, &message_info) ? tvb_captured_length(tvb) : 0; if( dissected != (int) tvb_captured_length(tvb) ) { - /* g_message( "%s : %d expected, %d dissected", mediatype, tvb_captured_length(tvb), dissected ); */ + /* ws_message( "%s : %d expected, %d dissected", mediatype, tvb_captured_length(tvb), dissected ); */ } } @@ -2392,25 +2392,25 @@ void proto_reg_handoff_jxta(void) if( gMSG_MEDIA ) { if( !msg_media_register_done ) { - /* g_message( "Registering JXTA Message media type" ); */ + /* ws_message( "Registering JXTA Message media type" ); */ dissector_add_string("media_type", "application/x-jxta-msg", message_jxta_handle); msg_media_register_done = TRUE; } } else { if( msg_media_register_done ) { - /* g_message( "Deregistering JXTA Message media type" ); */ + /* ws_message( "Deregistering JXTA Message media type" ); */ dissector_delete_string("media_type", "application/x-jxta-msg", message_jxta_handle); msg_media_register_done = FALSE; } } - /* g_message( "Registering UDP Heuristic dissector" ); */ + /* ws_message( "Registering UDP Heuristic dissector" ); */ heur_dissector_add("udp", dissect_jxta_UDP_heur, "JXTA over UDP", "jxta_udp", proto_jxta, HEURISTIC_ENABLE); - /* g_message( "Registering TCP Heuristic dissector" ); */ + /* ws_message( "Registering TCP Heuristic dissector" ); */ heur_dissector_add("tcp", dissect_jxta_TCP_heur, "JXTA over TCP", "jxta_tcp", proto_jxta, HEURISTIC_ENABLE); - /* g_message( "Registering SCTP Heuristic dissector" ); */ + /* ws_message( "Registering SCTP Heuristic dissector" ); */ heur_dissector_add("sctp", dissect_jxta_SCTP_heur, "JXTA over SCTP", "jxta_sctp", proto_jxta, HEURISTIC_ENABLE); } diff --git a/epan/dissectors/packet-knxip_decrypt.c b/epan/dissectors/packet-knxip_decrypt.c index 379d1792d6..24d4f3631c 100644 --- a/epan/dissectors/packet-knxip_decrypt.c +++ b/epan/dissectors/packet-knxip_decrypt.c @@ -9,8 +9,7 @@ * SPDX-License-Identifier: GPL-2.0-or-later */ -// Activate g_debug output with environment variable: G_MESSAGES_DEBUG=packet-knxip -#define G_LOG_DOMAIN "packet-knxip" +#define WS_LOG_DOMAIN "packet-knxip" #include <wsutil/file_util.h> #include "proto.h" @@ -18,6 +17,7 @@ #include <epan/wmem/wmem.h> #include <wsutil/wsgcrypt.h> #include <wsutil/strtoi.h> +#include <wsutil/wslog.h> #define TEXT_BUFFER_SIZE 128 @@ -582,7 +582,7 @@ void read_knx_keyring_xml_file( const gchar* key_file, const gchar* password, co make_password_hash( password_hash, password ); - g_debug( "%s:", key_file ); + ws_debug( "%s:", key_file ); gint c = fgetc( f ); @@ -672,7 +672,7 @@ void read_knx_keyring_xml_file( const gchar* key_file, const gchar* password, co if( !tag_end ) { // Found name="value" construct between < and > - g_debug( "%s %s=%s", tag_name, name, value ); + ws_debug( "%s %s=%s", tag_name, name, value ); // Process name/value pair if( strcmp( tag_name, "Keyring" ) == 0 ) diff --git a/epan/dissectors/packet-megaco.c b/epan/dissectors/packet-megaco.c index e05c71a30d..d791d4a3cd 100644 --- a/epan/dissectors/packet-megaco.c +++ b/epan/dissectors/packet-megaco.c @@ -801,7 +801,7 @@ dissect_megaco_text(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* d tokenlen = tvb_offset - tvb_previous_offset; token_index = find_megaco_messageBody_names(tvb, tvb_previous_offset, tokenlen); /* Debug code - g_warning("token_index %u",token_index); + ws_warning("token_index %u",token_index); */ tvb_LBRKT = tvb_find_guint8(tvb, tvb_offset, tvb_len, '{'); diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index 1471526d0f..6a2ef730f8 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -54,7 +54,7 @@ #define DEBUG_NBAP 0 #if DEBUG_NBAP #include <epan/to_str.h> -#define nbap_debug(...) g_warning(__VA_ARGS__) +#define nbap_debug(...) ws_warning(__VA_ARGS__) #else #define nbap_debug(...) #endif @@ -25070,7 +25070,7 @@ static int dissect_nbap_HSDSCH_Paging_System_InformationFDD(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { #line 2437 "./asn1/nbap/nbap.cnf" /* - g_warning("HS-DSCH Type 3 NOT Implemented!"); + ws_warning("HS-DSCH Type 3 NOT Implemented!"); */ offset = dissect_per_sequence(tvb, offset, actx, tree, hf_index, ett_nbap_HSDSCH_Paging_System_InformationFDD, HSDSCH_Paging_System_InformationFDD_sequence); diff --git a/epan/dissectors/packet-netflow.c b/epan/dissectors/packet-netflow.c index 354d9b267a..1029924783 100644 --- a/epan/dissectors/packet-netflow.c +++ b/epan/dissectors/packet-netflow.c @@ -142,7 +142,7 @@ void proto_register_netflow(void); void proto_reg_handoff_netflow(void); #if 0 -#define ipfix_debug(...) g_warning(__VA_ARGS__) +#define ipfix_debug(...) ws_warning(__VA_ARGS__) #else #define ipfix_debug(...) #endif diff --git a/epan/dissectors/packet-rohc.c b/epan/dissectors/packet-rohc.c index fca106161b..320778b1b5 100644 --- a/epan/dissectors/packet-rohc.c +++ b/epan/dissectors/packet-rohc.c @@ -2149,7 +2149,7 @@ dissect_rohc_ir_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gboolean tmp_prev_rnd = rohc_cid_context->rnd; gboolean tmp_prev_udp_checksum_present = rohc_cid_context->udp_checksum_present; - /*g_warning("IR pkt found CID %u",cid);*/ + /*ws_warning("IR pkt found CID %u",cid);*/ rohc_cid_context = wmem_new(wmem_file_scope(), rohc_cid_context_t); rohc_cid_context->profile = profile; @@ -2176,7 +2176,7 @@ dissect_rohc_ir_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, rohc_cid_context->rohc_ip_version = p_rohc_info->rohc_ip_version; rohc_cid_context->mode = p_rohc_info->mode; - /*g_warning("IR pkt New CID %u",cid);*/ + /*ws_warning("IR pkt New CID %u",cid);*/ g_hash_table_insert(rohc_cid_hash, GUINT_TO_POINTER(key), rohc_cid_context); p_add_proto_data(wmem_file_scope(), pinfo, proto_rohc, 0, rohc_cid_context); @@ -2270,7 +2270,7 @@ dissect_rohc_ir_dyn_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, gboolean tmp_prev_rnd = rohc_cid_context->rnd; gboolean tmp_prev_udp_checksum_present = rohc_cid_context->udp_checksum_present; - /*g_warning("IR pkt found CID %u",cid);*/ + /*ws_warning("IR pkt found CID %u",cid);*/ rohc_cid_context = wmem_new(wmem_file_scope(), rohc_cid_context_t); rohc_cid_context->profile = profile; @@ -2297,7 +2297,7 @@ dissect_rohc_ir_dyn_packet(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, rohc_cid_context->ir_frame_number = pinfo->num; rohc_cid_context->mode = p_rohc_info->mode; - /*g_warning("IR pkt New CID %u",cid);*/ + /*ws_warning("IR pkt New CID %u",cid);*/ g_hash_table_insert(rohc_cid_hash, GUINT_TO_POINTER(key), rohc_cid_context); p_add_proto_data(wmem_file_scope(), pinfo, proto_rohc, 0, rohc_cid_context); @@ -2544,10 +2544,10 @@ start_over: if (!pinfo->fd->visited){ gint key = cid; - /*g_warning("Lookup CID %u",cid);*/ + /*ws_warning("Lookup CID %u",cid);*/ rohc_cid_context = (rohc_cid_context_t*)g_hash_table_lookup(rohc_cid_hash, GUINT_TO_POINTER(key)); if(rohc_cid_context){ - /*g_warning("Found CID %u",cid);*/ + /*ws_warning("Found CID %u",cid);*/ }else{ rohc_cid_context = wmem_new(wmem_file_scope(), rohc_cid_context_t); /*rohc_cid_context->d_mode;*/ @@ -2559,7 +2559,7 @@ start_over: rohc_cid_context->large_cid_present = p_rohc_info->large_cid_present; rohc_cid_context->prev_ir_frame_number = -1; rohc_cid_context->ir_frame_number = -1; - /*g_warning("Store dummy data %u",cid);*/ + /*ws_warning("Store dummy data %u",cid);*/ } p_add_proto_data(wmem_file_scope(), pinfo, proto_rohc, 0, rohc_cid_context); } else { diff --git a/epan/dissectors/packet-rrc.c b/epan/dissectors/packet-rrc.c index 2f90ebd597..d8020b064b 100644 --- a/epan/dissectors/packet-rrc.c +++ b/epan/dissectors/packet-rrc.c @@ -100951,7 +100951,7 @@ dissect_rrc_START_Value(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, switch(cn_domain){ case RRC_NAS_SYS_INFO_CS: /* - g_warning("Not implemented"); + ws_warning("Not implemented"); */ break; case RRC_NAS_SYS_INFO_PS: diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index fcb7cf546f..496b4ce1c5 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -1417,7 +1417,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, pinfo->desegment_len = 0; #ifdef DEBUG_FRAGMENTS - g_debug("%d: RTP Part of convo %d(%p); seqno %d", + ws_debug("%d: RTP Part of convo %d(%p); seqno %d", pinfo->num, p_conv_data->frame_number, p_conv_data, seqno @@ -1432,7 +1432,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, fragment_head *fd_head; #ifdef DEBUG_FRAGMENTS - g_debug("\tContinues fragment %d", fid); + ws_debug("\tContinues fragment %d", fid); #endif /* we always assume the datagram is complete; if this is the @@ -1448,7 +1448,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, &rtp_fragment_items, NULL, tree); #ifdef DEBUG_FRAGMENTS - g_debug("\tFragment Coalesced; fd_head=%p, newtvb=%p (len %d)", fd_head, newtvb, + ws_debug("\tFragment Coalesced; fd_head=%p, newtvb=%p (len %d)", fd_head, newtvb, newtvb?tvb_reported_length(newtvb):0); #endif @@ -1463,7 +1463,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { if (pinfo->desegment_offset == 0) { #ifdef DEBUG_FRAGMENTS - g_debug("\tNo complete pdus in payload" ); + ws_debug("\tNo complete pdus in payload" ); #endif /* Mark the fragments as not complete yet */ fragment_set_partial_reassembly(&rtp_reassembly_table, @@ -1490,7 +1490,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * so process it as normal */ #ifdef DEBUG_FRAGMENTS - g_debug("\tRTP non-fragment payload"); + ws_debug("\tRTP non-fragment payload"); #endif newtvb = tvb_new_subset_length_caplen( tvb, offset, data_len, data_reported_len ); @@ -1515,7 +1515,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, fragment_head *fd_head; #ifdef DEBUG_FRAGMENTS - g_debug("\tRTP Must Desegment: tvb_len=%d ds_len=%d %d frag_len=%d ds_off=%d", + ws_debug("\tRTP Must Desegment: tvb_len=%d ds_len=%d %d frag_len=%d ds_off=%d", tvb_reported_length(newtvb), pinfo->desegment_len, pinfo->fd->visited, @@ -1547,13 +1547,13 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, fd_head->reassembled_in); proto_item_set_generated(rtp_tree_item); #ifdef DEBUG_FRAGMENTS - g_debug("\tReassembled in %d", fd_head->reassembled_in); + ws_debug("\tReassembled in %d", fd_head->reassembled_in); #endif } else if (fd_head->reassembled_in == 0) { #ifdef DEBUG_FRAGMENTS - g_debug("\tUnfinished fragment"); + ws_debug("\tUnfinished fragment"); #endif /* this fragment is never reassembled */ proto_tree_add_expert(tree, pinfo, &ei_rtp_fragment_unfinished, tvb, deseg_offset, -1); @@ -1566,7 +1566,7 @@ dissect_rtp_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, * frag_table; we don't yet know where it is reassembled */ #ifdef DEBUG_FRAGMENTS - g_debug("\tnew pdu"); + ws_debug("\tnew pdu"); #endif } diff --git a/epan/dissectors/packet-sccp.c b/epan/dissectors/packet-sccp.c index 0c7b9f16cf..c8e36642c8 100644 --- a/epan/dissectors/packet-sccp.c +++ b/epan/dissectors/packet-sccp.c @@ -933,7 +933,7 @@ sccp_reassemble_fragments(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, #define RETURN_FALSE \ do { \ - /*g_warning("Frame %d not protocol %d @ line %d", frame_num, my_mtp3_standard, __LINE__);*/ \ + /*ws_warning("Frame %d not protocol %d @ line %d", frame_num, my_mtp3_standard, __LINE__);*/ \ return FALSE; \ } while (0) diff --git a/epan/dissectors/packet-sctp.c b/epan/dissectors/packet-sctp.c index 947f3ef2a1..0e2d13f734 100644 --- a/epan/dissectors/packet-sctp.c +++ b/epan/dissectors/packet-sctp.c @@ -485,7 +485,7 @@ static struct _sctp_info sctp_info; #define RETURN_DIRECTION(direction) \ do { \ - /*g_warning("Returning %d at %d: a-itag=0x%x, a-vtag1=0x%x, a-vtag2=0x%x, b-itag=0x%x, b-vtag1=0x%x, b-vtag2=0x%x", \ + /*ws_warning("Returning %d at %d: a-itag=0x%x, a-vtag1=0x%x, a-vtag2=0x%x, b-itag=0x%x, b-vtag1=0x%x, b-vtag2=0x%x", \ direction, __LINE__, a->initiate_tag, a->verification_tag1, a->verification_tag2, b->initiate_tag, b->verification_tag1, b->verification_tag2);*/ \ return direction; \ } while (0) diff --git a/epan/dissectors/packet-sigcomp.c b/epan/dissectors/packet-sigcomp.c index 8664ccda72..dc8e9db325 100644 --- a/epan/dissectors/packet-sigcomp.c +++ b/epan/dissectors/packet-sigcomp.c @@ -982,9 +982,9 @@ static int udvm_state_access(tvbuff_t *tvb, proto_tree *tree,guint8 *buff,guint1 proto_tree_add_string(tree,hf_id, tvb, 0, 0, partial_state_str); /* Debug - * g_warning("State Access: partial state =%s",partial_state_str); - * g_warning("g_hash_table_lookup = 0x%x",state_buff); - * g_warning("State Access: partial state =%s",partial_state_str); + * ws_warning("State Access: partial state =%s",partial_state_str); + * ws_warning("g_hash_table_lookup = 0x%x",state_buff); + * ws_warning("State Access: partial state =%s",partial_state_str); */ state_buff = (guint8 *)g_hash_table_lookup(state_buffer_table, partial_state_str); if ( state_buff == NULL ) { @@ -1068,12 +1068,12 @@ static int udvm_state_access(tvbuff_t *tvb, proto_tree *tree,guint8 *buff,guint1 byte_copy_left = buff[64] << 8; byte_copy_left = byte_copy_left | buff[65]; /* debug - *g_warning(" state_begin %u state_address %u",state_begin , *state_address); + *ws_warning(" state_begin %u state_address %u",state_begin , *state_address); */ while ( (gint32) n < (state_begin + *state_length + 8) && n < UDVM_MEMORY_SIZE ) { buff[k] = state_buff[n]; /* debug - g_warning(" Loading 0x%x at address %u",buff[k] , k); + ws_warning(" Loading 0x%x at address %u",buff[k] , k); */ k = ( k + 1 ) & 0xffff; if ( k == byte_copy_right ) { @@ -1096,7 +1096,7 @@ static void udvm_state_create(guint8 *state_buff,guint8 *state_identifier,guint1 gchar *dummy_buff; /* * Debug - g_warning("Received items of state,state_length_buff[0]= %u, state_length_buff[1]= %u", + ws_warning("Received items of state,state_length_buff[0]= %u, state_length_buff[1]= %u", state_length_buff[0],state_length_buff[1]); */ @@ -1138,7 +1138,7 @@ void udvm_state_free(guint8 buff[],guint16 p_id_start,guint16 p_id_length) { partial_state_str = bytes_to_str(NULL, partial_state, p_id_length); /* TODO Implement a state create counter before actually freeing states * Hmm is it a good idea to free the buffer at all? - * g_warning("State-free on %s ",partial_state_str); + * ws_warning("State-free on %s ",partial_state_str); */ dummy_buff = g_hash_table_lookup(state_buffer_table, partial_state_str); if ( dummy_buff != NULL ) { @@ -1437,7 +1437,7 @@ decode_udvm_multitype_operand(guint8 *buff,guint operand_address, guint16 *value */ operand = buff[operand_address]; /* debug - *g_warning("Reading 0x%x From address %u",operand,offset); + *ws_warning("Reading 0x%x From address %u",operand,offset); */ *value = operand; offset ++; @@ -1508,7 +1508,7 @@ decode_udvm_multitype_operand(guint8 *buff,guint operand_address, guint16 *value temp_data16 = buff[(operand_address + 1) & 0xffff] << 8; temp_data16 = temp_data16 | buff[(operand_address + 2) & 0xffff]; /* debug - * g_warning("Reading 0x%x From address %u",temp_data16,operand_address); + * ws_warning("Reading 0x%x From address %u",temp_data16,operand_address); */ if ( (bytecode & 0x01) == 1 ) { memmory_addr = temp_data16; @@ -1545,7 +1545,7 @@ decode_udvm_multitype_operand(guint8 *buff,guint operand_address, guint16 *value temp_data16 = temp_data16 | buff[(memmory_addr+1) & 0xffff]; *value = temp_data16; /* debug - * g_warning("Reading 0x%x From address %u",temp_data16,memmory_addr); + * ws_warning("Reading 0x%x From address %u",temp_data16,memmory_addr); */ offset = offset +2; } diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index e909b437d2..cf81642304 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -49,6 +49,7 @@ #include <wsutil/filesystem.h> #include <wsutil/wsgcrypt.h> #include <wsutil/curve25519.h> +#include <wsutil/wslog.h> #include "packet-tcp.h" @@ -1411,7 +1412,7 @@ static void ssh_keylog_read_file(void) { if (!pref_keylog_file || !*pref_keylog_file) { - g_debug("no keylog file preference set"); + ws_debug("no keylog file preference set"); return; } @@ -1423,7 +1424,7 @@ ssh_keylog_read_file(void) if (!ssh_keylog_file) { ssh_keylog_file = ws_fopen(pref_keylog_file, "r"); if (!ssh_keylog_file) { - g_debug("ssh: failed to open key log file %s: %s", + ws_debug("ssh: failed to open key log file %s: %s", pref_keylog_file, g_strerror(errno)); return; } @@ -1441,7 +1442,7 @@ ssh_keylog_read_file(void) if (!fgets(buf, sizeof(buf), ssh_keylog_file)) { if (ferror(ssh_keylog_file)) { - g_debug("Error while reading %s, closing it.", pref_keylog_file); + ws_debug("Error while reading %s, closing it.", pref_keylog_file); ssh_keylog_reset(); } break; @@ -1454,14 +1455,14 @@ ssh_keylog_read_file(void) static void ssh_keylog_process_line(char *line) { - g_debug("ssh: process line: %s", line); + ws_debug("ssh: process line: %s", line); gchar **split = g_strsplit(line, " ", 2); gchar *key, *value; int key_len; if (g_strv_length(split) != 2) { - g_debug("ssh keylog: invalid format"); + ws_debug("ssh keylog: invalid format"); g_strfreev(split); return; } @@ -1472,7 +1473,7 @@ ssh_keylog_process_line(char *line) if (!strcmp(key, "curve25519")) { key_len = 32; } else { - g_debug("ssh: key exchange method not supported"); + ws_debug("ssh: key exchange method not supported"); g_strfreev(split); return; } @@ -1486,7 +1487,7 @@ ssh_keylog_process_line(char *line) hexbyte[1] = value[i * 2 + 1]; if (!ws_hexstrtou8(hexbyte, NULL, &c)) { - g_debug("ssh: can't process key, invalid hex number: %s", hexbyte); + ws_debug("ssh: can't process key, invalid hex number: %s", hexbyte); g_free(converted); g_strfreev(split); return; @@ -1527,18 +1528,18 @@ ssh_keylog_add_keys(guint8 *priv, guint priv_length, gchar *type_string) if (SSH_KEX_CURVE25519 == type) { if (crypto_scalarmult_curve25519_base(pub->data, priv)) { - g_debug("cannot compute curve25519 public key"); + ws_debug("cannot compute curve25519 public key"); return; } } else { - g_debug("key type %s not supported", type_string); + ws_debug("key type %s not supported", type_string); return; } if (!wmem_map_contains(ssh_kex_keys, pub)) { ssh_kex_key *value = ssh_kex_make_key(NULL, priv_length); if (!value) { - g_debug("invalid key length %u", priv_length); + ws_debug("invalid key length %u", priv_length); return; } memcpy(value->data, priv, priv_length); @@ -1594,7 +1595,7 @@ ssh_read_e(tvbuff_t *tvb, int offset, struct ssh_flow_data *global_data) guint type = ssh_kex_type(global_data->kex); ssh_kex_pub_key *kex = ssh_kex_make_pub_key(NULL, length, type); if (!kex) { - g_debug("invalid key length %u", length); + ws_debug("invalid key length %u", length); return; } global_data->kex_e = kex; @@ -1640,7 +1641,7 @@ ssh_keylog_compute_hash(tvbuff_t *tvb, int offset, priv = (ssh_kex_key *)wmem_map_lookup(ssh_kex_keys, &kex_f); if (!priv) { - g_debug("ssh decryption: private key not available"); + ws_debug("ssh decryption: private key not available"); return; // we have the server's private key @@ -1690,12 +1691,12 @@ ssh_kex_shared_secret(ssh_kex_pub_key *pub, ssh_kex_key *priv) { ssh_kex_key *secret = ssh_kex_make_key(NULL, pub->length); if (!secret) { - g_debug("invalid key length %u", pub->length); + ws_debug("invalid key length %u", pub->length); return NULL; } if (crypto_scalarmult_curve25519(secret->data, priv->data, pub->data)) { - g_debug("curve25519: can't compute shared secret"); + ws_debug("curve25519: can't compute shared secret"); return NULL; } diff --git a/epan/dissectors/packet-sua.c b/epan/dissectors/packet-sua.c index 1196d7fed6..aada606039 100644 --- a/epan/dissectors/packet-sua.c +++ b/epan/dissectors/packet-sua.c @@ -454,7 +454,7 @@ sua_assoc(packet_info* pinfo, address* opc, address* dpc, guint src_rn, guint ds assoc = new_assoc(opck, dpck); wmem_tree_insert32_array(assocs,bw_key,assoc); assoc->has_bw_key = TRUE; - /*g_warning("CORE dpck %u,opck %u,src_rn %u",dpck,opck,src_rn);*/ + /*ws_warning("CORE dpck %u,opck %u,src_rn %u",dpck,opck,src_rn);*/ } break; @@ -489,7 +489,7 @@ sua_assoc(packet_info* pinfo, address* opc, address* dpc, guint src_rn, guint ds bw_key[3].length = 0; bw_key[3].key = NULL; - /*g_warning("MESSAGE_TYPE_COAK dst_rn %u,src_rn %u ",dst_rn,src_rn);*/ + /*ws_warning("MESSAGE_TYPE_COAK dst_rn %u,src_rn %u ",dst_rn,src_rn);*/ if ( ( assoc = (sua_assoc_info_t *)wmem_tree_lookup32_array(assocs, bw_key) ) ) { goto got_assoc; } diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index 970e708aa2..64ce14c395 100644 --- a/epan/dissectors/packet-tcp.c +++ b/epan/dissectors/packet-tcp.c @@ -1885,7 +1885,7 @@ pdu_store_sequencenumber_of_next_pdu(packet_info *pinfo, guint32 seq, guint32 nx msp->last_frame_time=pinfo->abs_ts; msp->flags=0; wmem_tree_insert32(multisegment_pdus, seq, (void *)msp); - /*g_warning("pdu_store_sequencenumber_of_next_pdu: seq %u", seq);*/ + /*ws_warning("pdu_store_sequencenumber_of_next_pdu: seq %u", seq);*/ return msp; } diff --git a/epan/dissectors/packet-tpncp.c b/epan/dissectors/packet-tpncp.c index d8f5be9455..6f9c0b49ea 100644 --- a/epan/dissectors/packet-tpncp.c +++ b/epan/dissectors/packet-tpncp.c @@ -12,7 +12,7 @@ /*---------------------------------------------------------------------------*/ -#define G_LOG_DOMAIN "TPNCP" +#define WS_LOG_DOMAIN "TPNCP" #include "config.h" #include <epan/packet.h> diff --git a/epan/dissectors/packet-wireguard.c b/epan/dissectors/packet-wireguard.c index 15eda2a1c1..e2fd7adee6 100644 --- a/epan/dissectors/packet-wireguard.c +++ b/epan/dissectors/packet-wireguard.c @@ -17,8 +17,7 @@ #include <errno.h> -/* Start with G_MESSAGES_DEBUG=packet-wireguard to see messages. */ -#define G_LOG_DOMAIN "packet-wireguard" +#define WS_LOG_DOMAIN "packet-wireguard" #include <epan/packet.h> #include <epan/expert.h> @@ -30,6 +29,7 @@ #include <wsutil/filesystem.h> #include <wsutil/wsgcrypt.h> #include <wsutil/curve25519.h> +#include <wsutil/wslog.h> #include <epan/secrets.h> #include <wiretap/secrets-types.h> @@ -644,17 +644,17 @@ wg_keylog_read(void) // Reopen file if it got deleted/overwritten. if (wg_keylog_file && file_needs_reopen(ws_fileno(wg_keylog_file), pref_keylog_file)) { - g_debug("Key log file got changed or deleted, trying to re-open."); + ws_debug("Key log file got changed or deleted, trying to re-open."); wg_keylog_reset(); } if (!wg_keylog_file) { wg_keylog_file = ws_fopen(pref_keylog_file, "r"); if (!wg_keylog_file) { - g_debug("Failed to open key log file %s: %s", pref_keylog_file, g_strerror(errno)); + ws_debug("Failed to open key log file %s: %s", pref_keylog_file, g_strerror(errno)); return; } - g_debug("Opened key log file %s", pref_keylog_file); + ws_debug("Opened key log file %s", pref_keylog_file); } /* File format: each line follows the format "<type>=<key>" (leading spaces @@ -675,7 +675,7 @@ wg_keylog_read(void) if (feof(wg_keylog_file)) { clearerr(wg_keylog_file); } else if (ferror(wg_keylog_file)) { - g_debug("Error while reading %s, closing it.", pref_keylog_file); + ws_debug("Error while reading %s, closing it.", pref_keylog_file); wg_keylog_reset(); } break; @@ -706,7 +706,7 @@ wg_keylog_process_lines(const void *data, guint datalen) linelen--; /* drop CR */ } - g_debug("Read WG key log line: %.*s", (int)linelen, line); + ws_debug("Read WG key log line: %.*s", (int)linelen, line); /* Strip leading spaces. */ const char *p = line; @@ -741,7 +741,7 @@ wg_keylog_process_lines(const void *data, guint datalen) wg_qqword key; if (!key_value[0] || !decode_base64_key(&key, key_value)) { - g_debug("Unrecognized key log line: %.*s", (int)linelen, line); + ws_debug("Unrecognized key log line: %.*s", (int)linelen, line); continue; } @@ -757,10 +757,10 @@ wg_keylog_process_lines(const void *data, guint datalen) wg_add_psk(wg_keylog_last_ekey, &key); wg_keylog_last_ekey = NULL; } else { - g_debug("Ignored PSK as no new ephemeral key was found"); + ws_debug("Ignored PSK as no new ephemeral key was found"); } } else { - g_debug("Unrecognized key log line: %.*s", (int)linelen, line); + ws_debug("Unrecognized key log line: %.*s", (int)linelen, line); } } } @@ -940,7 +940,7 @@ wg_process_response(tvbuff_t *tvb, wg_handshake_state_t *hs) // XXX when multiple responses are linkable to a single handshake state, // they should probably fork into a new state or be discarded when equal. if (hs->initiator_recv_cipher || hs->responder_recv_cipher) { - g_warning("%s FIXME multiple responses linked to a single session", G_STRFUNC); + ws_warning("%s FIXME multiple responses linked to a single session", G_STRFUNC); return; } DISSECTOR_ASSERT(!hs->initiator_recv_cipher); @@ -1943,7 +1943,7 @@ proto_register_wg(void) &pref_keylog_file, FALSE); if (!wg_decrypt_init()) { - g_warning("%s: decryption will not be possible due to lack of algorithms support", G_STRFUNC); + ws_warning("%s: decryption will not be possible due to lack of algorithms support", G_STRFUNC); } secrets_register_type(SECRETS_TYPE_WIREGUARD, wg_keylog_process_lines); diff --git a/extcap/etw_message.c b/extcap/etw_message.c index b78e7bc3ff..97cc608f27 100644 --- a/extcap/etw_message.c +++ b/extcap/etw_message.c @@ -10,6 +10,7 @@ */ #include "etw_message.h" +#include <wsutil/wslog.h> ULONGLONG g_num_events = 0; VOID format_message(WCHAR* lpszMessage, PROPERTY_KEY_VALUE* propArray, DWORD dwPropertyCount, WCHAR* lpszOutBuffer, DWORD dwOutBufferCount) diff --git a/extcap/etwdump.c b/extcap/etwdump.c index e2ccaeb95f..bc8fb3b04e 100644 --- a/extcap/etwdump.c +++ b/extcap/etwdump.c @@ -18,6 +18,7 @@ #include <wsutil/filesystem.h> #include <wsutil/privileges.h> #include <wsutil/please_report_bug.h> +#include <wsutil/wslog.h> #include <cli_main.h> #include <ui/cmdarg_err.h> |