aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2005-10-06 20:01:25 +0000
committerAnders Broman <anders.broman@ericsson.com>2005-10-06 20:01:25 +0000
commit5ddbeb2cb8bf074af3bb332b7f523cbc12897650 (patch)
tree755f50557d256c2e4acd845c0222078f3d5055cc /wiretap
parentf7b0c35663798262da91791271f1b0a8621929c2 (diff)
From Rene Pilz,
In the bssgp an IE was decoded as mobile identity and should be decoded as (p)tmsi only. The patch is attached to this email. It also consists the new atm patch which was send yesterday. svn path=/trunk/; revision=16146
Diffstat (limited to 'wiretap')
-rw-r--r--wiretap/atm.c15
1 files changed, 15 insertions, 0 deletions
diff --git a/wiretap/atm.c b/wiretap/atm.c
index 16a026f6fb..1e7ced15d0 100644
--- a/wiretap/atm.c
+++ b/wiretap/atm.c
@@ -81,6 +81,21 @@ atm_guess_traffic_type(const guint8 *pd, guint32 len,
* multiplexed RFC 1483 traffic.
*/
pseudo_header->atm.type = TRAF_LLCMX;
+ } else if (pseudo_header->atm.aal5t_len < 14) {
+ /*
+ * As this cannot be an ethernet frame
+ * (less than 14 bytes) we can try it
+ * as a SSCOP frame
+ */
+ pseudo_header->atm.aal = AAL_SIGNALLING;
+ } else if (pd[0] == 0x83 || pd[0] == 0x81) {
+ /*
+ * MTP3b headers often encapsulate
+ * a SCCP or MTN in the 3G network.
+ * This should cause 0x83 or 0x81
+ * in the first byte.
+ */
+ pseudo_header->atm.aal = AAL_SIGNALLING;
} else {
/*
* Assume it's LANE.