Re: [Openbts-discuss] [PATCH] GSM: Correct GSMTAP channel types

[Michael I. <mic...@ra...>]

Pushed to master. Thanks!

> El 21/1/2015, a las 2:22, Thomas Tsou <to...@ts...> escribió:
> 
> GSMTAP channel types are not consistent with current Wireshark types,
> which originate from libosmocore.
> 
> http://cgit.osmocom.org/cgit/libosmocore/tree/include/osmocom/core/gsmtap.h
> 
> The types may not have been supported in Wireshark at the previous time
> of modification, however, they are now supported in mainline and popular
> distributions.
> 
> Signed-off-by: Tom Tsou <to...@ts...>
> ---
> GSM/gsmtap.h | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/GSM/gsmtap.h b/GSM/gsmtap.h
> index c2e73b7..5dc869d 100644
> --- a/GSM/gsmtap.h
> +++ b/GSM/gsmtap.h
> @@ -77,11 +77,11 @@
> #define GSMTAP_CHANNEL_SDCCH8	0x08
> #define GSMTAP_CHANNEL_TCH_F	0x09
> #define GSMTAP_CHANNEL_TCH_H	0x0a
> -#define GSMTAP_CHANNEL_CBCH51	0x0b
> +#define GSMTAP_CHANNEL_PACCH	0x0b
> #define GSMTAP_CHANNEL_CBCH52	0x0c
> -#define GSMTAP_CHANNEL_PDCH	0x0d		// pats note: This one is not implemented in wireshark.
> -#define GSMTAP_CHANNEL_PTCCH	0x0e		// pats note: and neither is this one.
> -#define GSMTAP_CHANNEL_PACCH	0x0f		// pats note: This is the one that is implemented.
> +#define GSMTAP_CHANNEL_PDCH	0x0d
> +#define GSMTAP_CHANNEL_PTCCH	0x0e
> +#define GSMTAP_CHANNEL_CBCH51	0x0f
> #define GSMTAP_CHANNEL_ACCH	0x80
> 
> /* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */
> -- 
> 2.1.0
>