--- include/osmocom/core/gsmtap.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index c1c53d0..5d4755b 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -43,7 +43,7 @@ #define GSMTAP_TYPE_GMR1_UM 0x0a /* GMR-1 L2 packets */ #define GSMTAP_TYPE_UMTS_RLC_MAC 0x0b #define GSMTAP_TYPE_UMTS_RRC 0x0c - +#define GSMTAP_TYPE_LTE_RRC 0x0d
/* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */
@@ -131,6 +131,13 @@
/* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */
+#define GSMTAP_LTE_CH_BCCH 0x01 +#define GSMTAP_LTE_CH_CCCH 0x02 +#define GSMTAP_LTE_CH_DCCH 0x03 +#define GSMTAP_LTE_CH_MCCH 0x04 +#define GSMTAP_LTE_CH_PCCH 0x05 +#define GSMTAP_LTE_CH_SCH 0x06 + #define GSMTAP_UMTS_CH_PCCH 0x01 #define GSMTAP_UMTS_CH_CCCH 0x02 #define GSMTAP_UMTS_CH_DCCH 0x03
This patch proposes extension to GSMTAP to support LTE frames - the same way it supports UMTS. I've tried to pick defines to be compatible with wireshark.
Suggestions and extensions are highly appreciated.
Hi Max,
@ttsou, you're pretty familiar with LTE right ? Can you give it a quick look just to get a second opinion. (mine is pretty useless as my lte knowledge is near zero).
diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index c1c53d0..5d4755b 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -43,7 +43,7 @@ #define GSMTAP_TYPE_GMR1_UM 0x0a /* GMR-1 L2 packets */ #define GSMTAP_TYPE_UMTS_RLC_MAC 0x0b #define GSMTAP_TYPE_UMTS_RRC 0x0c
+#define GSMTAP_TYPE_LTE_RRC 0x0d
The '-' is an unecessary whitespace change.
/* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */
+#define GSMTAP_LTE_CH_BCCH 0x01 +#define GSMTAP_LTE_CH_CCCH 0x02 +#define GSMTAP_LTE_CH_DCCH 0x03 +#define GSMTAP_LTE_CH_MCCH 0x04 +#define GSMTAP_LTE_CH_PCCH 0x05 +#define GSMTAP_LTE_CH_SCH 0x06
#define GSMTAP_UMTS_CH_PCCH 0x01 #define GSMTAP_UMTS_CH_CCCH 0x02 #define GSMTAP_UMTS_CH_DCCH 0x03
1) I'd add a new separate section witht ehe " ==== ..." marker before / after and put it after the UMTS section to keep the order. Also add the same comment that those are for the GSMTAP_TYPE_LTE_RRC (look at the UM / TETRA / GMR section).
2) tab vs space for alignement of the values
Cheers,
Sylvain
On Tue, Jun 10, 2014 at 9:10 AM, Max Suraev Max.Suraev@fairwaves.co wrote:
+#define GSMTAP_LTE_CH_BCCH 0x01 +#define GSMTAP_LTE_CH_CCCH 0x02 +#define GSMTAP_LTE_CH_DCCH 0x03 +#define GSMTAP_LTE_CH_MCCH 0x04 +#define GSMTAP_LTE_CH_PCCH 0x05 +#define GSMTAP_LTE_CH_SCH 0x06
The SCH is a transport channel upon which the other control channels are mapped. Downlink or uplink SCH won't interact with RRC directly, so it seems the logical traffic channels DTCH (Dedicated Traffic Channel) and MTCH (Multicast Traffic Channel) are more appropriate here.
-TT
--- include/osmocom/core/gsmtap.h | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/include/osmocom/core/gsmtap.h b/include/osmocom/core/gsmtap.h index c1c53d0..5fac711 100644 --- a/include/osmocom/core/gsmtap.h +++ b/include/osmocom/core/gsmtap.h @@ -43,7 +43,7 @@ #define GSMTAP_TYPE_GMR1_UM 0x0a /* GMR-1 L2 packets */ #define GSMTAP_TYPE_UMTS_RLC_MAC 0x0b #define GSMTAP_TYPE_UMTS_RRC 0x0c - +#define GSMTAP_TYPE_LTE_RRC 0x0d /* LTE interface */
/* ====== DO NOT MAKE UNAPPROVED MODIFICATIONS HERE ===== */
@@ -135,6 +135,15 @@ #define GSMTAP_UMTS_CH_CCCH 0x02 #define GSMTAP_UMTS_CH_DCCH 0x03
+/* sub-types for TYPE_LTE_RRC */ +#define GSMTAP_LTE_CH_BCCH 0x01 +#define GSMTAP_LTE_CH_CCCH 0x02 +#define GSMTAP_LTE_CH_DCCH 0x03 +#define GSMTAP_LTE_CH_MCCH 0x04 +#define GSMTAP_LTE_CH_PCCH 0x05 +#define GSMTAP_LTE_CH_DTCH 0x06 +#define GSMTAP_LTE_CH_MTCH 0x07 + /* flags for the ARFCN */ #define GSMTAP_ARFCN_F_PCS 0x8000 #define GSMTAP_ARFCN_F_UPLINK 0x4000
Thanks for your comments: incorporated @ttsou suggestion on SCH, fixed tab-vs-space. As for whitespace change in the beginning - I think it's necessary to match usage of ====== header throughout the rest of the file.
Signed-off-by: Sylvain Munaut tnt@246tNt.com
I'll give it a couple of days to make sure everybody interested has a chance to view it, but if there are no other comments / suggestions in the mean time, I'll push that to master.
Applied.
BTW, you might want to include a signed-off-by line next time.
Cheers,
Sylvain
Thanks. Is there some git option for that or it's just plain text in a long comment?
15.06.2014 18:58, Sylvain Munaut пишет:
Applied.
BTW, you might want to include a signed-off-by line next time.
Cheers,
Sylvain
On Sun, Jun 15, 2014 at 5:35 PM, ☎ Max.Suraev@fairwaves.co wrote:
Is there some git option for that or it's just plain text in a long comment?
git commit --signoff
-TT
On Sun, Jun 15, 2014 at 11:35:16PM +0200, ☎ wrote:
15.06.2014 18:58, Sylvain Munaut пишет:
BTW, you might want to include a signed-off-by line next time.
Is there some git option for that or it's just plain text in a long comment?
That's an option to 'git commit', it's '-s, --signoff', documented in the man page.
Kind regards, -Alex
Thanks for clarification guys. One more thing - was I supposed to put me or Sylvain in there?
Thanks for clarification guys. One more thing - was I supposed to put me or Sylvain in there?
Yourself.
The Signed-off-by chain is essentially taking responsibility for the patch.
When taking a patch off the list, I'll add my own line to it to basically say I looked over the patch, tested it and that to the best of my knowledge the patch complies with the license.
Cheers,
Sylvain
baseband-devel@lists.osmocom.org
-
Alexander Huemer -
Max Suraev -
Sylvain Munaut -
Tom Tsou -
☎