osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

GTPv2: always set direction before dissecting PCO IE 

Otherwise some protocol/container ID payload are skipped as their decoding depends on the direction that is unknown
Bug: 11378

Change-Id: Ic14aa67fe4f262a9f3056e8f70f58afd78c59043
Reviewed-on: https://code.wireshark.org/review/9710
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
This commit is contained in:
Pascal Quantin 2015-07-20 13:24:58 +02:00
parent 030da2a611
commit 09ae055f23
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
epan/dissectors/packet-gtpv2.c
View File

@ -562,6 +562,16 @@ static expert_field ei_gtpv2_ie = EI_INIT;
#define GTPV2_CREATE_SESSION_REQUEST 32
#define GTPV2_CREATE_SESSION_RESPONSE 33
#define GTPV2_MODIFY_BEARER_RESPONSE 35
#define GTPV2_DELETE_SESSION_REQUEST 36
#define GTPV2_DELETE_SESSION_RESPONSE 37
#define GTPV2_BEARER_RESOURCE_COMMAND 68
#define GTPV2_CREATE_BEARER_REQUEST 95
#define GTPV2_CREATE_BEARER_RESPONSE 96
#define GTPV2_UPDATE_BEARER_REQUEST 97
#define GTPV2_UPDATE_BEARER_RESPONSE 98
#define GTPV2_DELETE_BEARER_REQUEST 99
#define GTPV2_DELETE_BEARER_RESPONSE 100
#define GTPV2_CONTEXT_RESPONSE 131
#define GTPV2_FORWARD_RELOCATION_REQ 133
#define GTPV2_FORWARD_CTX_NOTIFICATION 137
@ -1812,10 +1822,20 @@ dissect_gtpv2_pco(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_ite
{
switch (message_type) {
case GTPV2_CREATE_SESSION_REQUEST:
case GTPV2_DELETE_SESSION_REQUEST:
case GTPV2_BEARER_RESOURCE_COMMAND:
case GTPV2_CREATE_BEARER_RESPONSE:
case GTPV2_UPDATE_BEARER_RESPONSE:
case GTPV2_DELETE_BEARER_RESPONSE:
/* PCO options as MS to network direction */
pinfo->link_dir = P2P_DIR_UL;
break;
case GTPV2_CREATE_SESSION_RESPONSE:
case GTPV2_MODIFY_BEARER_RESPONSE:
case GTPV2_DELETE_SESSION_RESPONSE:
case GTPV2_CREATE_BEARER_REQUEST:
case GTPV2_UPDATE_BEARER_REQUEST:
case GTPV2_DELETE_BEARER_REQUEST:
/* PCO options as Network to MS direction: */
pinfo->link_dir = P2P_DIR_DL;
break;
@ -5242,10 +5262,20 @@ dissect_gtpv2_apco(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, prot
{
switch (message_type) {
case GTPV2_CREATE_SESSION_REQUEST:
case GTPV2_DELETE_SESSION_REQUEST:
case GTPV2_BEARER_RESOURCE_COMMAND:
case GTPV2_CREATE_BEARER_RESPONSE:
case GTPV2_UPDATE_BEARER_RESPONSE:
case GTPV2_DELETE_BEARER_RESPONSE:
/* PCO options as MS to network direction */
pinfo->link_dir = P2P_DIR_UL;
break;
case GTPV2_CREATE_SESSION_RESPONSE:
case GTPV2_MODIFY_BEARER_RESPONSE:
case GTPV2_DELETE_SESSION_RESPONSE:
case GTPV2_CREATE_BEARER_REQUEST:
case GTPV2_UPDATE_BEARER_REQUEST:
case GTPV2_DELETE_BEARER_REQUEST:
/* PCO options as Network to MS direction: */
pinfo->link_dir = P2P_DIR_DL;
break;