fix trivial compiler error and vs2010 reswig

diff --git a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
index c37bffb7a1084484ee5c9218bd09db27274afc34..90c1a2e68cda3cd9db76ce34aef4bb5270eb7c07 100644 (file)
--- a/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
+++ b/src/mod/languages/mod_managed/freeswitch_wrap.2010.cxx
@@ -13563,6 +13563,18 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_cert_verify(void * jarg1) {
 }\r
 \r
 \r
+SWIGEXPORT int SWIGSTDCALL CSharp_switch_core_session_refresh_video(void * jarg1) {\r
+  int jresult ;\r
+  switch_core_session_t *arg1 = (switch_core_session_t *) 0 ;\r
+  switch_status_t result;\r
+  \r
+  arg1 = (switch_core_session_t *)jarg1; \r
+  result = (switch_status_t)switch_core_session_refresh_video(arg1);\r
+  jresult = result; \r
+  return jresult;\r
+}\r
+\r
+\r
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_loadable_module_interface_module_name_set(void * jarg1, char * jarg2) {\r
   switch_loadable_module_interface *arg1 = (switch_loadable_module_interface *) 0 ;\r
   char *arg2 = (char *) 0 ;\r
@@ -35218,26 +35230,6 @@ SWIGEXPORT void * SWIGSTDCALL CSharp_switch_rtp_get_private(void * jarg1) {
 }\r
 \r
 \r
-SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_activate_stun_ping(void * jarg1, char * jarg2, unsigned short jarg3, unsigned long jarg4, int jarg5) {\r
-  int jresult ;\r
-  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;\r
-  char *arg2 = (char *) 0 ;\r
-  switch_port_t arg3 ;\r
-  uint32_t arg4 ;\r
-  switch_bool_t arg5 ;\r
-  switch_status_t result;\r
-  \r
-  arg1 = (switch_rtp_t *)jarg1; \r
-  arg2 = (char *)jarg2; \r
-  arg3 = (switch_port_t)jarg3; \r
-  arg4 = (uint32_t)jarg4; \r
-  arg5 = (switch_bool_t)jarg5; \r
-  result = (switch_status_t)switch_rtp_activate_stun_ping(arg1,(char const *)arg2,arg3,arg4,arg5);\r
-  jresult = result; \r
-  return jresult;\r
-}\r
-\r
-\r
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_intentional_bugs(void * jarg1, int jarg2) {\r
   switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;\r
   switch_rtp_bug_flag_t arg2 ;\r
@@ -35312,6 +35304,14 @@ SWIGEXPORT int SWIGSTDCALL CSharp_switch_rtp_has_dtls() {
 }\r
 \r
 \r
+SWIGEXPORT void SWIGSTDCALL CSharp_switch_rtp_video_refresh(void * jarg1) {\r
+  switch_rtp_t *arg1 = (switch_rtp_t *) 0 ;\r
+  \r
+  arg1 = (switch_rtp_t *)jarg1; \r
+  switch_rtp_video_refresh(arg1);\r
+}\r
+\r
+\r
 SWIGEXPORT void SWIGSTDCALL CSharp_switch_log_node_t_data_set(void * jarg1, char * jarg2) {\r
   switch_log_node_t *arg1 = (switch_log_node_t *) 0 ;\r
   char *arg2 = (char *) 0 ;\r

diff --git a/src/mod/languages/mod_managed/managed/swig.2010.cs b/src/mod/languages/mod_managed/managed/swig.2010.cs
index 44e6f034b988259b00da888b0af376bd74038358..ac74b01bb22a83bba8c90cd21b89c355b7bfa54b 100644 (file)
--- a/src/mod/languages/mod_managed/managed/swig.2010.cs
+++ b/src/mod/languages/mod_managed/managed/swig.2010.cs
@@ -3127,6 +3127,11 @@ public class freeswitch {
     return ret;\r
   }\r
 \r
+  public static switch_status_t switch_core_session_refresh_video(SWIGTYPE_p_switch_core_session session) {\r
+    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_core_session_refresh_video(SWIGTYPE_p_switch_core_session.getCPtr(session));\r
+    return ret;\r
+  }\r
+\r
   public static switch_status_t switch_loadable_module_init(switch_bool_t autoload) {\r
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_loadable_module_init((int)autoload);\r
     return ret;\r
@@ -6042,11 +6047,6 @@ public class freeswitch {
     return ret;\r
   }\r
 \r
-  public static switch_status_t switch_rtp_activate_stun_ping(SWIGTYPE_p_switch_rtp rtp_session, string stun_ip, ushort stun_port, uint packet_count, switch_bool_t funny) {\r
-    switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_rtp_activate_stun_ping(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), stun_ip, stun_port, packet_count, (int)funny);\r
-    return ret;\r
-  }\r
-\r
   public static void switch_rtp_intentional_bugs(SWIGTYPE_p_switch_rtp rtp_session, switch_rtp_bug_flag_t bugs) {\r
     freeswitchPINVOKE.switch_rtp_intentional_bugs(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session), (int)bugs);\r
   }\r
@@ -6076,6 +6076,10 @@ public class freeswitch {
     return ret;\r
   }\r
 \r
+  public static void switch_rtp_video_refresh(SWIGTYPE_p_switch_rtp rtp_session) {\r
+    freeswitchPINVOKE.switch_rtp_video_refresh(SWIGTYPE_p_switch_rtp.getCPtr(rtp_session));\r
+  }\r
+\r
   public static switch_status_t switch_log_init(SWIGTYPE_p_apr_pool_t pool, switch_bool_t colorize) {\r
     switch_status_t ret = (switch_status_t)freeswitchPINVOKE.switch_log_init(SWIGTYPE_p_apr_pool_t.getCPtr(pool), (int)colorize);\r
     return ret;\r
@@ -10339,6 +10343,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_core_cert_verify")]\r
   public static extern int switch_core_cert_verify(HandleRef jarg1);\r
 \r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_core_session_refresh_video")]\r
+  public static extern int switch_core_session_refresh_video(HandleRef jarg1);\r
+\r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_loadable_module_interface_module_name_set")]\r
   public static extern void switch_loadable_module_interface_module_name_set(HandleRef jarg1, string jarg2);\r
 \r
@@ -15463,9 +15470,6 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_get_private")]\r
   public static extern IntPtr switch_rtp_get_private(HandleRef jarg1);\r
 \r
-  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_activate_stun_ping")]\r
-  public static extern int switch_rtp_activate_stun_ping(HandleRef jarg1, string jarg2, ushort jarg3, uint jarg4, int jarg5);\r
-\r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_intentional_bugs")]\r
   public static extern void switch_rtp_intentional_bugs(HandleRef jarg1, int jarg2);\r
 \r
@@ -15484,6 +15488,9 @@ class freeswitchPINVOKE {
   [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_has_dtls")]\r
   public static extern int switch_rtp_has_dtls();\r
 \r
+  [DllImport("mod_managed", EntryPoint="CSharp_switch_rtp_video_refresh")]\r
+  public static extern void switch_rtp_video_refresh(HandleRef jarg1);\r
+\r
   [DllImport("mod_managed", EntryPoint="CSharp_switch_log_node_t_data_set")]\r
   public static extern void switch_log_node_t_data_set(HandleRef jarg1, string jarg2);\r
 \r
@@ -25819,6 +25826,7 @@ public enum switch_channel_flag_t {
   CF_DTLS,\r
   CF_VERBOSE_SDP,\r
   CF_DTLS_OK,\r
+  CF_VIDEO_PASSIVE,\r
   CF_FLAG_MAX\r
 }\r
 \r

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 0e381d082587309889c17e0d229c1add41193a3e..995d1d2bfb3dc8c89a20846fbcb2cb96fd3c7b54 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -1371,7 +1371,6 @@ static void send_fir(switch_rtp_t *rtp_session)
                                break;
                        case zrtp_status_drop:
                                switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error: zRTP protection drop with code %d\n", stat);
-                               ret = (int)rtcp_bytes;
                                goto end;
                                break;
                        case zrtp_status_fail: