Fixed compiling issues when enabling GSM MS side support.

diff --git a/appbridge.cpp b/appbridge.cpp
index 7309c80..e94de02 100644 (file)
--- a/appbridge.cpp
+++ b/appbridge.cpp
@@ -148,7 +148,7 @@ fail:
 #endif
 #ifdef WITH_GSM_MS
        if (interface_out->gsm_ms) {
-               port = new Pgsm_bs(PORT_TYPE_GSM_MS_OUT, portname, &port_settings, interface_out);
+               port = new Pgsm_ms(PORT_TYPE_GSM_MS_OUT, portname, &port_settings, interface_out);
        } else
 #endif
        {

diff --git a/apppbx.cpp b/apppbx.cpp
index bacdba9..c80c20a 100644 (file)
--- a/apppbx.cpp
+++ b/apppbx.cpp
@@ -753,7 +753,7 @@ void EndpointAppPBX::out_setup(int cfnr)
                                earlyb = (interface->is_earlyb == IS_YES);
                        } else
 #endif
-#ifdef WITH_GSM_MS
+#ifdef WITH_SIP
                        if (interface->sip) {
                                SPRINT(portname, "%s-%d-out", interface->name, 0);
                                port = new Psip(PORT_TYPE_SIP_OUT, portname, &port_settings, interface);
@@ -1021,7 +1021,7 @@ void EndpointAppPBX::out_setup(int cfnr)
                                earlyb = (interface->is_earlyb == IS_YES);
                        } else
 #endif
-#ifdef WITH_GSM_MS
+#ifdef WITH_SIP
                        if (interface->sip) {
                                SPRINT(portname, "%s-%d-out", interface->name, 0);
                                port = new Psip(PORT_TYPE_SIP_OUT, portname, &port_settings, interface);

diff --git a/mncc.h b/mncc.h
index 14dd6d4..25af62a 100644 (file)
--- a/mncc.h
+++ b/mncc.h
@@ -192,12 +192,12 @@ struct gsm_data_frame {
 };
 
 struct gsm_mncc_rtp {
-       uint32_t        msg_type;
-       uint32_t        callref;
-       uint32_t        ip;
-       uint16_t        port;
-       uint32_t        payload_type;
-       uint32_t        payload_msg_type;
+       u_int32_t       msg_type;
+       u_int32_t       callref;
+       u_int32_t       ip;
+       u_int16_t       port;
+       u_int32_t       payload_type;
+       u_int32_t       payload_msg_type;
 };