Adding upstream version 4.4.0.upstream/4.4.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 40 insertions, 40 deletions

diff --git a/epan/dissectors/packet-portmap.c b/epan/dissectors/packet-portmap.c
index 6dd62c3a..98a22988 100644
--- a/epan/dissectors/packet-portmap.c
+++ b/epan/dissectors/packet-portmap.c
@@ -26,31 +26,31 @@
 void proto_register_portmap(void);
 void proto_reg_handoff_portmap(void);
 
-static int proto_portmap = -1;
-static int hf_portmap_procedure_v1 = -1;
-static int hf_portmap_procedure_v2 = -1;
-static int hf_portmap_procedure_v3 = -1;
-static int hf_portmap_procedure_v4 = -1;
-static int hf_portmap_proto = -1;
-static int hf_portmap_prog = -1;
-static int hf_portmap_proc = -1;
-static int hf_portmap_version = -1;
-static int hf_portmap_port = -1;
-static int hf_portmap_answer = -1;
-static int hf_portmap_args = -1;
-static int hf_portmap_result = -1;
-static int hf_portmap_rpcb = -1;
-static int hf_portmap_rpcb_prog = -1;
-static int hf_portmap_rpcb_version = -1;
-static int hf_portmap_rpcb_netid = -1;
-static int hf_portmap_rpcb_addr = -1;
-static int hf_portmap_rpcb_owner = -1;
-static int hf_portmap_uaddr = -1;
-
-
-static gint ett_portmap = -1;
-static gint ett_portmap_rpcb = -1;
-static gint ett_portmap_entry = -1;
+static int proto_portmap;
+static int hf_portmap_procedure_v1;
+static int hf_portmap_procedure_v2;
+static int hf_portmap_procedure_v3;
+static int hf_portmap_procedure_v4;
+static int hf_portmap_proto;
+static int hf_portmap_prog;
+static int hf_portmap_proc;
+static int hf_portmap_version;
+static int hf_portmap_port;
+static int hf_portmap_answer;
+static int hf_portmap_args;
+static int hf_portmap_result;
+static int hf_portmap_rpcb;
+static int hf_portmap_rpcb_prog;
+static int hf_portmap_rpcb_version;
+static int hf_portmap_rpcb_netid;
+static int hf_portmap_rpcb_addr;
+static int hf_portmap_rpcb_owner;
+static int hf_portmap_uaddr;
+
+
+static int ett_portmap;
+static int ett_portmap_rpcb;
+static int ett_portmap_entry;
 
 static dissector_handle_t rpc_handle;
 
@@ -59,8 +59,8 @@ static int
 dissect_getport_call(tvbuff_t *tvb, packet_info *pinfo _U_,
 	proto_tree *tree, void* data)
 {
-	guint32 proto, version;
-	guint32 prog;
+	uint32_t proto, version;
+	uint32_t prog;
 	const char *prog_name;
 	const char *proto_name;
 	int offset = 0;
@@ -116,7 +116,7 @@ static int
 dissect_getport_reply(tvbuff_t *tvb, packet_info *pinfo _U_,
 	proto_tree *tree, void* data)
 {
-	guint32 portx;
+	uint32_t portx;
 	int offset = 0;
 
 	/* we might have learnt a <ipaddr><protocol><port> mapping for ONC-RPC*/
@@ -124,7 +124,7 @@ dissect_getport_reply(tvbuff_t *tvb, packet_info *pinfo _U_,
 		rpc_call_info_value *rpc_call=(rpc_call_info_value *)data;
 		/* only do this for UDP, TCP does not need anything like this */
 		if(rpc_call && (GPOINTER_TO_UINT(rpc_call->private_data)==PT_UDP) ){
-			guint32 port;
+			uint32_t port;
 			port=tvb_get_ntohl(tvb, offset);
 			if(port){
 				conversation_t *conv;
@@ -156,8 +156,8 @@ static int
 dissect_set_call(tvbuff_t *tvb, packet_info *pinfo _U_,
 	proto_tree *tree, void* data _U_)
 {
-	guint32 proto;
-	guint32 prog;
+	uint32_t proto;
+	uint32_t prog;
 	int offset = 0;
 
 	if ( tree )
@@ -185,8 +185,8 @@ static int
 dissect_unset_call(tvbuff_t *tvb, packet_info *pinfo _U_,
 	proto_tree *tree, void* data _U_)
 {
-	guint32 proto;
-	guint32 prog;
+	uint32_t proto;
+	uint32_t prog;
 	int offset = 0;
 
 	if ( tree )
@@ -260,7 +260,7 @@ static int
 dissect_callit_call(tvbuff_t *tvb, packet_info *pinfo,
 	proto_tree *tree, void* data _U_)
 {
-	guint32 prog, vers, proc;
+	uint32_t prog, vers, proc;
 	int offset = 0;
 
 	prog = tvb_get_ntohl(tvb, offset+0);
@@ -283,7 +283,7 @@ dissect_callit_call(tvbuff_t *tvb, packet_info *pinfo,
 	{
 		proto_tree_add_uint_format_value(tree, hf_portmap_proc, tvb,
 			offset+8, 4, proc, "%s (%u)",
-			rpc_proc_name(prog, vers, proc), proc);
+			rpc_proc_name(pinfo->pool, prog, vers, proc), proc);
 	}
 
 	offset += 12;
@@ -291,7 +291,7 @@ dissect_callit_call(tvbuff_t *tvb, packet_info *pinfo,
 	/* Dissect the arguments for this procedure.
 	   Make the columns non-writable, so the dissector won't change
 	   them out from under us. */
-	col_set_writable(pinfo->cinfo, -1, FALSE);
+	col_set_writable(pinfo->cinfo, -1, false);
 	offset = dissect_rpc_indir_call(tvb, pinfo, tree, offset,
 		hf_portmap_args, prog, vers, proc);
 
@@ -312,7 +312,7 @@ dissect_callit_reply(tvbuff_t *tvb, packet_info *pinfo,
 	/* Dissect the result of this procedure.
 	   Make the columns non-writable, so the dissector won't change
 	   them out from under us. */
-	col_set_writable(pinfo->cinfo, -1, FALSE);
+	col_set_writable(pinfo->cinfo, -1, false);
 	offset = dissect_rpc_indir_reply(tvb, pinfo, tree, offset,
 		hf_portmap_result, hf_portmap_prog, hf_portmap_version,
 		hf_portmap_proc);
@@ -375,7 +375,7 @@ dissect_rpcb(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *tree
 	proto_item* rpcb_item;
 	proto_tree* rpcb_tree;
 	int old_offset = offset;
-	guint32 prog;
+	uint32_t prog;
 
 	rpcb_item = proto_tree_add_item(tree, hf_portmap_rpcb, tvb,
 			offset, -1, ENC_NA);
@@ -447,7 +447,7 @@ dissect_rpcb_rmtcallres(tvbuff_t *tvb, packet_info *pinfo _U_,
 	/* Dissect the result of this procedure.
 	   Make the columns non-writable, so the dissector won't change
 	   them out from under us. */
-	col_set_writable(pinfo->cinfo, -1, FALSE);
+	col_set_writable(pinfo->cinfo, -1, false);
 	offset = dissect_rpc_indir_reply(tvb, pinfo, tree, offset,
 		hf_portmap_result, hf_portmap_prog, hf_portmap_version,
 		hf_portmap_proc);
@@ -610,7 +610,7 @@ proto_register_portmap(void)
 			"Universal Address", "portmap.uaddr", FT_STRING, BASE_NONE,
 			NULL, 0, NULL, HFILL }},
 	};
-	static gint *ett[] = {
+	static int *ett[] = {
 		&ett_portmap,
 		&ett_portmap_rpcb,
 		&ett_portmap_entry