diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 6ceb9b127..d06f3cf3b 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -3664,6 +3664,7 @@ void sip_config_uninit(LinphoneCore *lc) int i; sip_config_t *config=&lc->sip_conf; lp_config_set_int(lc->config,"sip","sip_port",config->transports.udp_port); + lp_config_set_int(lc->config,"sip","sip_tcp_port",config->transports.tcp_port); lp_config_set_int(lc->config,"sip","guess_hostname",config->guess_hostname); lp_config_set_string(lc->config,"sip","contact",config->contact); lp_config_set_int(lc->config,"sip","inc_timeout",config->inc_timeout); diff --git a/gtk/parameters.ui b/gtk/parameters.ui index c594612cd..ffc98e234 100644 --- a/gtk/parameters.ui +++ b/gtk/parameters.ui @@ -28,7 +28,15 @@ 1 - 1 + 0 + 65535 + 1 + 10 + 10 + + + 1 + 0 65535 1 10 @@ -252,7 +260,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK - 3 + 4 2 @@ -265,8 +273,8 @@ 1 2 - 2 - 3 + 3 + 4 @@ -277,6 +285,21 @@ adjustment3 + + 1 + 2 + 2 + 3 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + adjustment_tcp_port + + 1 2 @@ -285,12 +308,12 @@ - + True True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK adjustment4 - + 1 @@ -305,8 +328,8 @@ right - 2 - 3 + 3 + 4 @@ -316,6 +339,18 @@ Audio RTP/UDP: right + + 2 + 3 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + SIP (TCP): + right + 1 2 diff --git a/gtk/propertybox.c b/gtk/propertybox.c index 179a134b7..50aa58857 100644 --- a/gtk/propertybox.c +++ b/gtk/propertybox.c @@ -102,9 +102,22 @@ void linphone_gtk_ipv6_toggled(GtkWidget *w){ gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(w))); } -void linphone_gtk_sip_port_changed(GtkWidget *w){ - linphone_core_set_sip_port(linphone_gtk_get_core(), - (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(w))); +void linphone_gtk_udp_sip_port_changed(GtkWidget *w){ + LCSipTransports tr; + LinphoneCore *lc=linphone_gtk_get_core(); + + linphone_core_get_sip_transports(lc,&tr); + tr.udp_port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); + linphone_core_set_sip_transports(lc,&tr); +} + +void linphone_gtk_tcp_sip_port_changed(GtkWidget *w){ + LCSipTransports tr; + LinphoneCore *lc=linphone_gtk_get_core(); + + linphone_core_get_sip_transports(lc,&tr); + tr.tcp_port = (gint)gtk_spin_button_get_value(GTK_SPIN_BUTTON(w)); + linphone_core_set_sip_transports(lc,&tr); } void linphone_gtk_audio_port_changed(GtkWidget *w){ @@ -746,12 +759,16 @@ void linphone_gtk_show_parameters(void){ GtkWidget *codec_list=linphone_gtk_get_widget(pb,"codec_list"); int mtu; int ui_advanced; + LCSipTransports tr; /* NETWORK CONFIG */ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(linphone_gtk_get_widget(pb,"ipv6_enabled")), linphone_core_ipv6_enabled(lc)); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"sip_port")), - linphone_core_get_sip_port(lc)); + linphone_core_get_sip_transports(lc,&tr); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"udp_sip_port")), + tr.udp_port); + gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"tcp_sip_port")), + tr.tcp_port); gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"audio_rtp_port")), linphone_core_get_audio_port(lc)); gtk_spin_button_set_value(GTK_SPIN_BUTTON(linphone_gtk_get_widget(pb,"video_rtp_port")),