diff options
author | Evan Huus <eapache@gmail.com> | 2012-10-26 00:42:34 +0000 |
---|---|---|
committer | Evan Huus <eapache@gmail.com> | 2012-10-26 00:42:34 +0000 |
commit | c6b522bc703bd91b5c473491a68e92b5319e819c (patch) | |
tree | 531fb34d8bbdba3d2a27de3c5e457243f6fa2fd7 /epan/dissectors | |
parent | d97b4ec325830bee235568138ba4151edc253c54 (diff) | |
download | wireshark-c6b522bc703bd91b5c473491a68e92b5319e819c.tar.gz |
Revert revision 44921.
See discussion on https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7728
svn path=/trunk/; revision=45791
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/packet-ieee80211.c | 28 | ||||
-rw-r--r-- | epan/dissectors/packet-mgcp.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-radius.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-rpc.c | 6 |
4 files changed, 19 insertions, 19 deletions
diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index b57f64cad6..15836c5eac 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -11399,15 +11399,15 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, src = tvb_get_ptr (tvb, 10, 6); dst = tvb_get_ptr (tvb, 4, 6); - SET_ADDRESS_SUB(&pinfo->dl_src, AT_ETHER, AT_SUB_IEEE80211, 6, src); - SET_ADDRESS_SUB(&pinfo->src, AT_ETHER, AT_SUB_IEEE80211, 6, src); - SET_ADDRESS_SUB(&pinfo->dl_dst, AT_ETHER, AT_SUB_IEEE80211, 6, dst); - SET_ADDRESS_SUB(&pinfo->dst, AT_ETHER, AT_SUB_IEEE80211, 6, dst); + SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src); + SET_ADDRESS(&pinfo->src, AT_ETHER, 6, src); + SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, dst); + SET_ADDRESS(&pinfo->dst, AT_ETHER, 6, dst); /* for tap */ - SET_ADDRESS_SUB(&whdr->bssid, AT_ETHER, AT_SUB_IEEE80211, 6, tvb_get_ptr(tvb, 16,6)); - SET_ADDRESS_SUB(&whdr->src, AT_ETHER, AT_SUB_IEEE80211, 6, src); - SET_ADDRESS_SUB(&whdr->dst, AT_ETHER, AT_SUB_IEEE80211, 6, dst); + SET_ADDRESS(&whdr->bssid, AT_ETHER, 6, tvb_get_ptr(tvb, 16,6)); + SET_ADDRESS(&whdr->src, AT_ETHER, 6, src); + SET_ADDRESS(&whdr->dst, AT_ETHER, 6, dst); whdr->type = frame_type_subtype; seq_control = tvb_get_letohs(tvb, 22); @@ -11779,16 +11779,16 @@ dissect_ieee80211_common (tvbuff_t * tvb, packet_info * pinfo, break; } - SET_ADDRESS_SUB(&pinfo->dl_src, AT_ETHER, AT_SUB_IEEE80211, 6, src); - SET_ADDRESS_SUB(&pinfo->src, AT_ETHER, AT_SUB_IEEE80211, 6, src); - SET_ADDRESS_SUB(&pinfo->dl_dst, AT_ETHER, AT_SUB_IEEE80211, 6, dst); - SET_ADDRESS_SUB(&pinfo->dst, AT_ETHER, AT_SUB_IEEE80211, 6, dst); + SET_ADDRESS(&pinfo->dl_src, AT_ETHER, 6, src); + SET_ADDRESS(&pinfo->src, AT_ETHER, 6, src); + SET_ADDRESS(&pinfo->dl_dst, AT_ETHER, 6, dst); + SET_ADDRESS(&pinfo->dst, AT_ETHER, 6, dst); /* for tap */ - SET_ADDRESS_SUB(&whdr->bssid, AT_ETHER, AT_SUB_IEEE80211, 6, bssid); - SET_ADDRESS_SUB(&whdr->src, AT_ETHER, AT_SUB_IEEE80211, 6, src); - SET_ADDRESS_SUB(&whdr->dst, AT_ETHER, AT_SUB_IEEE80211, 6, dst); + SET_ADDRESS(&whdr->bssid, AT_ETHER, 6, bssid); + SET_ADDRESS(&whdr->src, AT_ETHER, 6, src); + SET_ADDRESS(&whdr->dst, AT_ETHER, 6, dst); whdr->type = frame_type_subtype; seq_control = tvb_get_letohs(tvb, 22); diff --git a/epan/dissectors/packet-mgcp.c b/epan/dissectors/packet-mgcp.c index bf510aaaaa..58212bc79e 100644 --- a/epan/dissectors/packet-mgcp.c +++ b/epan/dissectors/packet-mgcp.c @@ -1396,7 +1396,7 @@ static void dissect_mgcp_firstline(tvbuff_t *tvb, packet_info *pinfo, proto_tree const gchar *verb_description = ""; char code_with_verb[64] = ""; /* To fit "<4-letter-code> (<longest-verb>)" */ - static address null_address = { AT_NONE, AT_SUB_NONE, 0, NULL }; + static address null_address = { AT_NONE, 0, NULL }; tvb_previous_offset = 0; tvb_len = tvb_length(tvb); tvb_current_len = tvb_len; diff --git a/epan/dissectors/packet-radius.c b/epan/dissectors/packet-radius.c index 5ae39fbd69..7455d7ca03 100644 --- a/epan/dissectors/packet-radius.c +++ b/epan/dissectors/packet-radius.c @@ -1356,7 +1356,7 @@ dissect_radius(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _ radius_call_info_key radius_call_key; radius_call_info_key *new_radius_call_key; radius_call_t *radius_call = NULL; - static address null_address = { AT_NONE, AT_SUB_NONE, 0, NULL }; + static address null_address = { AT_NONE, 0, NULL }; /* does this look like radius ? */ if(!is_radius(tvb)){ diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 6b08dac9ca..2bed5aafd3 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -1547,7 +1547,7 @@ dissect_rpc_indir_call(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int args_id, guint32 prog, guint32 vers, guint32 proc) { conversation_t* conversation; - static address null_address = { AT_NONE, AT_SUB_NONE, 0, NULL }; + static address null_address = { AT_NONE, 0, NULL }; rpc_proc_info_key key; rpc_proc_info_value *value; rpc_call_info_value *rpc_call; @@ -1697,7 +1697,7 @@ dissect_rpc_indir_reply(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset, int result_id, int prog_id, int vers_id, int proc_id) { conversation_t* conversation; - static address null_address = { AT_NONE, AT_SUB_NONE, 0, NULL }; + static address null_address = { AT_NONE, 0, NULL }; rpc_call_info_value *rpc_call; char *procname=NULL; dissect_function_t *dissect_function = NULL; @@ -1929,7 +1929,7 @@ dissect_rpc_message(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, rpc_proc_info_key key; rpc_proc_info_value *value = NULL; conversation_t* conversation; - static address null_address = { AT_NONE, AT_SUB_NONE, 0, NULL }; + static address null_address = { AT_NONE, 0, NULL }; nstime_t ns; dissect_function_t *dissect_function = NULL; |