Harald Welte has submitted this change and it was merged.
Change subject: osmux-reference: Use packetdiag to draw packet header structures
......................................................................
osmux-reference: Use packetdiag to draw packet header structures
Change-Id: Id75152278f41d56b7bd2e652b9947e33d6523c64
---
M OsmoBSC/Makefile
M OsmoBSC/osmux-reference.adoc
2 files changed, 50 insertions(+), 16 deletions(-)
Approvals:
Harald Welte: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/OsmoBSC/Makefile b/OsmoBSC/Makefile
index 93c7b81..35f50da 100644
--- a/OsmoBSC/Makefile
+++ b/OsmoBSC/Makefile
@@ -33,6 +33,9 @@
-rm aoip-mgw-options*.png
-rm aoip-mgw-options*.svg
-rm aoip-mgw-options*.check
+ -rm osmux-reference__*.svg
+ -rm osmux-reference__*.png
+ -rm osmux-reference__*.check
gen-bsc-vty-docbook: FORCE
$(call command,xsltproc -o generated/combined1.xml \
diff --git a/OsmoBSC/osmux-reference.adoc b/OsmoBSC/osmux-reference.adoc
index 068bc19..b2767f3 100644
--- a/OsmoBSC/osmux-reference.adoc
+++ b/OsmoBSC/osmux-reference.adoc
@@ -144,14 +144,22 @@
=== LAPD Signalling (0)
- 0 1 2 3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|X|FT |X X X X X| PL-LENGTH | LAPD header + payload |
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+[packetdiag]
+----
+{
+ colwidth = 32
+ node_height = 40
+
+ 0: -
+ 1-2: FT
+ 3-7: ----
+ 8-15: PL-LENGTH
+ 16-31: LAPD header + payload
+}
+----
Field Type (FT): 2 bits::
-The Field Type allocated for AMR codec is "0".
+The Field Type allocated for LAPD Signalling is "0".
This frame type is not yet supported inside OsmoCom and may be subject to
change in future versions of the protocol.
@@ -162,11 +170,23 @@
This OSmux packet header is used to transport one or more RTP-AMR packets for a
specific RTP stream identified by the Circuit ID field.
- 0 1 2 3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|M|FT | CTR |F|Q| Red. TS/SeqNR | Circuit ID |AMR FT |AMR CMR|
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+[packetdiag]
+----
+{
+ colwidth = 32
+ node_height = 40
+
+ 0: M
+ 1-2: FT
+ 3-5: CTR
+ 6: F
+ 7: Q
+ 8-15: Red. TS/SeqNR
+ 16-23: Circuit ID
+ 24-27: AMR FT
+ 28-31: AMR CMR
+}
+----
Marker (M): 1 bit::
This is a 1:1 mapping from the RTP Marker (M) bit as specified in RFC3550
@@ -246,11 +266,22 @@
When opening a connection, the peer is expected to send dummy packets until it
starts sending real audio, at which point dummy packets are not needed anymore.
- 0 1 2 3
- 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-|X|FT | CTR |X X|X X X X X X X X X| Circuit ID |AMR FT |X X X X|
-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+[packetdiag]
+----
+{
+ colwidth = 32
+ node_height = 40
+
+ 0: -
+ 1-2: FT
+ 3-5: CTR
+ 6-7: --
+ 8-15: ----
+ 16-23: Circuit ID
+ 24-27: AMR FT
+ 28-31: ----
+}
+----
Field Type (FT): 2 bits::
The Field Type allocated for AMR codec is "2".
--
To view, visit https://gerrit.osmocom.org/3299
To unsubscribe, visit https://gerrit.osmocom.org/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id75152278f41d56b7bd2e652b9947e33d6523c64
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-manuals
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <[email protected]>
Gerrit-Reviewer: Harald Welte <[email protected]>
Gerrit-Reviewer: Jenkins Builder
