Change in osmo-ttcn3-hacks[master]: msc: add sdp to MNCC

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

laforge gerrit-no-reply at lists.osmocom.org
Sat Nov 23 07:59:07 UTC 2019


laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16032 )

Change subject: msc: add sdp to MNCC
......................................................................

msc: add sdp to MNCC

SDP is added to the MNCC protocol in osmo-msc
Ie16f0804c4d99760cd4a0c544d0889b6313eebb7.
This patch adds SDP to the ttcn3 MNCC messaging.

These changes still work with current osmo-msc master that doesn't send SDP /
ignores received SDP in MNCC.

Change-Id: Ic9568c8927507e161aadfad1a4d20aa896d8ae30
---
M library/MNCC_EncDec.cc
M library/MNCC_Types.ttcn
M library/mncc.h
3 files changed, 106 insertions(+), 50 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  pespin: Looks good to me, but someone else must approve
  Jenkins Builder: Verified



diff --git a/library/MNCC_EncDec.cc b/library/MNCC_EncDec.cc
index b4937e7..f2692d7 100644
--- a/library/MNCC_EncDec.cc
+++ b/library/MNCC_EncDec.cc
@@ -259,7 +259,7 @@
 	case MNCC_RTP_FREE:
 		in_rtp = (const struct gsm_mncc_rtp *) in_mncc;
 		rtp = MNCC__PDU__Rtp(in_rtp->callref, in_rtp->ip, in_rtp->port, in_rtp->payload_type,
-				     in_rtp->payload_msg_type);
+				     in_rtp->payload_msg_type, in_rtp->sdp);
 		u.rtp() = rtp;
 		break;
 	default:
@@ -315,6 +315,7 @@
 		sign.imsi() = CHARSTRING(in_mncc->imsi);
 		sign.lchan__type() = in_mncc->lchan_type;
 		sign.lchan__mode() = in_mncc->lchan_mode;
+		sign.sdp() = in_mncc->sdp;
 		u.signal() = sign;
 		break;
 	}
diff --git a/library/MNCC_Types.ttcn b/library/MNCC_Types.ttcn
index 828f341..5296579 100644
--- a/library/MNCC_Types.ttcn
+++ b/library/MNCC_Types.ttcn
@@ -360,7 +360,9 @@
 	charstring	imsi,
 
 	uint8_t		lchan_type,	/* empty in OSmoMSC */
-	uint8_t		lchan_mode	/* empty in OsmoMSC */
+	uint8_t		lchan_mode,	/* empty in OsmoMSC */
+
+	charstring	sdp optional
 };
 
 
@@ -374,7 +376,9 @@
 	uint32_t	ip,
 	uint16_t	rtp_port,
 	uint32_t	payload_type,
-	uint32_t	payload_msg_type
+	uint32_t	payload_msg_type,
+
+	charstring	sdp optional
 };
 
 type record MNCC_PDU_Hello {
@@ -464,7 +468,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -494,7 +499,8 @@
 			emergency := *,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -527,7 +533,8 @@
 			emergency := omit,
 			imsi := imsi,
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 };
@@ -559,7 +566,8 @@
 			emergency := *,
 			imsi := imsi,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 };
@@ -592,7 +600,8 @@
 			emergency := omit,
 			imsi := imsi,
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 };
@@ -623,7 +632,8 @@
 			emergency := omit,
 			imsi := imsi,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 };
@@ -656,7 +666,8 @@
 			emergency := *,
 			imsi := imsi,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -688,7 +699,8 @@
 			emergency := omit,
 			imsi := imsi,
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -719,7 +731,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -750,7 +763,8 @@
 			emergency := *,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -791,7 +805,8 @@
 			emergency := omit,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -822,7 +837,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -855,7 +871,8 @@
 			emergency := omit,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -887,7 +904,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -922,7 +940,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -955,7 +974,8 @@
 			emergency := omit,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -988,7 +1008,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1021,7 +1042,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1053,7 +1075,8 @@
 			emergency := omit,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -1088,7 +1111,8 @@
 			emergency := *,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -1120,7 +1144,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1152,7 +1177,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1183,7 +1209,8 @@
 			emergency := *,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -1217,7 +1244,8 @@
 			emergency := *,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -1249,7 +1277,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1283,7 +1312,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1316,7 +1346,8 @@
 			emergency := *,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -1349,7 +1380,8 @@
 			emergency := *,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -1381,7 +1413,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1413,7 +1446,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1443,7 +1477,8 @@
 			emergency := omit,
 			imsi := ?,
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1490,7 +1525,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1521,7 +1557,8 @@
 			emergency := *,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -1552,7 +1589,8 @@
 			emergency := *,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -1583,7 +1621,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1614,7 +1653,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1653,7 +1693,8 @@
 			emergency := *,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -1684,7 +1725,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1715,7 +1757,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1747,7 +1790,8 @@
 			emergency := *,
 			imsi := ?,
 			lchan_type := ?,
-			lchan_mode := ?
+			lchan_mode := ?,
+			sdp := *
 		}
 	}
 }
@@ -1778,7 +1822,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1810,7 +1855,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1849,7 +1895,8 @@
 			emergency := omit,
 			imsi := "",
 			lchan_type := 0,
-			lchan_mode := 0
+			lchan_mode := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1877,7 +1924,8 @@
 			ip := 0,
 			rtp_port := 0,
 			payload_type := 0,
-			payload_msg_type := 0
+			payload_msg_type := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1897,7 +1945,8 @@
 			ip := ip,
 			rtp_port := rtp_port,
 			payload_type := payload_type,
-			payload_msg_type := ?
+			payload_msg_type := ?,
+			sdp := *
 		}
 	}
 }
@@ -1911,7 +1960,8 @@
 			ip := ip,
 			rtp_port := rtp_port,
 			payload_type := pt,
-			payload_msg_type := 0
+			payload_msg_type := 0,
+			sdp := ""
 		}
 	}
 }
@@ -1926,7 +1976,8 @@
 			ip := ip,
 			rtp_port := rtp_port,
 			payload_type := pt,
-			payload_msg_type := 0
+			payload_msg_type := 0,
+			sdp := ""
 		}
 	}
 }
diff --git a/library/mncc.h b/library/mncc.h
index 3e00db8..9aff948 100644
--- a/library/mncc.h
+++ b/library/mncc.h
@@ -265,6 +265,8 @@
 
 	unsigned char	lchan_type;
 	unsigned char	lchan_mode;
+
+	char		sdp[1024];
 };
 
 struct gsm_data_frame {
@@ -296,6 +298,8 @@
 	uint16_t	port;
 	uint32_t	payload_type;
 	uint32_t	payload_msg_type;
+
+	char		sdp[1024];
 };
 
 struct gsm_mncc_bridge {

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/16032
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ic9568c8927507e161aadfad1a4d20aa896d8ae30
Gerrit-Change-Number: 16032
Gerrit-PatchSet: 4
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191123/873f06d2/attachment.htm>


More information about the gerrit-log mailing list