mgw: Use official Titan SDP library for encode/decode of SDP in MGCP
diff --git a/mgw/MGCP_Types.ttcn b/mgw/MGCP_Types.ttcn
index efe7620..9b55659 100644
--- a/mgw/MGCP_Types.ttcn
+++ b/mgw/MGCP_Types.ttcn
@@ -65,7 +65,7 @@
type record MgcpCommand {
MgcpCommandLine line,
MgcpParameterList params optional,
- Sdp sdp optional
+ SDP_Message sdp optional
} with {
variant "BEGIN('')"
variant (sdp) "BEGIN('\r\n','([\r\n])|(\r\n)')"
@@ -89,7 +89,7 @@
type record MgcpResponse {
MgcpResponseLine line,
MgcpParameterList params optional,
- Sdp sdp optional
+ SDP_Message sdp optional
} with {
variant "BEGIN('')"
variant (sdp) "BEGIN('\r\n','([\r\n])|(\r\n)')"
diff --git a/mgw/SDP_Types.ttcn b/mgw/SDP_Types.ttcn
deleted file mode 100644
index 02e2f41..0000000
--- a/mgw/SDP_Types.ttcn
+++ /dev/null
@@ -1,28 +0,0 @@
-module SDP_Types {
-
- type char SdpTag;
- type record SdpLine {
- SdpTag tag,
- charstring val
- } with {
- variant "BEGIN('')"
- variant "SEPARATOR('=')"
- variant "END('\r\n')"
- };
-
- type record of SdpLine SdpLineList with {
- variant "BEGIN('')"
- };
-
- type record Sdp {
- SdpLineList lines
- } with {
- variant "BEGIN('')"
- };
-
- external function enc_Sdp(in Sdp id) return charstring
- with { extension "prototype(convert) encode(TEXT)" };
- external function dec_Sdp(in charstring id) return Sdp
- with { extension "prototype(convert) decode(TEXT)" };
-
-} with { encode "TEXT" }
diff --git a/mgw/gen_links.sh b/mgw/gen_links.sh
new file mode 100755
index 0000000..b60aeef
--- /dev/null
+++ b/mgw/gen_links.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+BASEDIR=~/projects/git
+
+gen_links() {
+ DIR=$1
+ FILES=$*
+ for f in $FILES; do
+ echo "Linking $f"
+ ln -sf $DIR/$f $f
+ done
+}
+
+#DIR=$BASEDIR/titan.TestPorts.UNIX_DOMAIN_SOCKETasp/src
+#FILES="UD_PT.cc UD_PT.hh UD_PortType.ttcn UD_Types.ttcn"
+#gen_links $DIR $FILES
+
+DIR=$BASEDIR/titan.ProtocolModules.SDP/src
+FILES="SDP_EncDec.cc SDP_Types.ttcn SDP_parse_.tab.c SDP_parse_.tab.h SDP_parse_parser.h SDP_parser.l
+SDP_parser.y lex.SDP_parse_.c"
+gen_links $DIR $FILES
diff --git a/mgw/regen_makefile.sh b/mgw/regen_makefile.sh
index 098299d..8b68b2f 100755
--- a/mgw/regen_makefile.sh
+++ b/mgw/regen_makefile.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-FILES="*.ttcn"
+FILES="*.ttcn SDP_EncDec.cc *.c"
ttcn3_makefilegen -f MGCP_Test.ttcn $FILES
sed -i -e 's/# TTCN3_DIR = /TTCN3_DIR = \/usr/' Makefile