Changeset 182:f526c16d302a in mediastreamer2

Timestamp:

Nov 30, 2008 10:08:26 AM (5 years ago)

Author:

smorlat <smorlat@…>

Branch:

default

Message:

• added russian translation
• ui improvements (closes call upon window destroy)
• detection of symmetric firewalls.

git-svn-id: ​svn+ssh://svn.savannah.nongnu.org/linphone/trunk@185 3f6dc0c8-ddfe-455d-9043-3cd528dc4637

Location:

linphone

Files:

• configure.in (modified) (1 diff)
• coreapi/misc.c (modified) (9 diffs)
• gtk-glade/main.c (modified) (1 diff)
• m4/exosip.m4 (modified) (1 diff)
• po/ru.po (added)

linphone/configure.in

@@ -39 +39 @@
 dnl Add the languages which your application supports here.
 PKG_PROG_PKG_CONFIG
-ALL_LINGUAS="fr it de ja es pl cs nl sv pt_BR hu"
+ALL_LINGUAS="fr it de ja es pl cs nl sv pt_BR hu ru"
 GETTEXT_PACKAGE=linphone
 AM_GNU_GETTEXT([external])

linphone/coreapi/misc.c

@@ -502 +502 @@
 }
 
-static int sendStunRequest(int sock, const struct sockaddr *server, socklen_t addrlen, int id){
+static int sendStunRequest(int sock, const struct sockaddr *server, socklen_t addrlen, int id, bool_t changeAddr){
         char buf[STUN_MAX_MESSAGE_SIZE];
         int len = STUN_MAX_MESSAGE_SIZE;
@@ -512 +512 @@
         memset(&username,0,sizeof(username));
         memset(&password,0,sizeof(password));
-        stunBuildReqSimple( &req, &username, FALSE , FALSE , id);
+        stunBuildReqSimple( &req, &username, changeAddr , changeAddr , id);
         len = stunEncodeMessage( &req, buf, len, &password, FALSE);
         if (len<=0){
@@ -555 +555 @@
 }
 
-static int recvStunResponse(ortp_socket_t sock, char *ipaddr, int *port){
+static int recvStunResponse(ortp_socket_t sock, char *ipaddr, int *port, int *id){
         char buf[STUN_MAX_MESSAGE_SIZE];
         int len = STUN_MAX_MESSAGE_SIZE;
@@ -563 +563 @@
                 struct in_addr ia;
                 stunParseMessage(buf,len, &resp,FALSE );
+                *id=resp.msgHdr.id.octet[0];
                 *port = resp.mappedAddress.ipv4.port;
                 ia.s_addr=htonl(resp.mappedAddress.ipv4.addr);
@@ -583 +584 @@
                 bool_t video_enabled=linphone_core_video_enabled(lc);
                 bool_t got_audio,got_video;
+                bool_t cone_audio=FALSE,cone_video=FALSE;
                 struct timeval init,cur;
                 if (parse_stun_server_addr(server,&ss,&ss_len)<0){
@@ -598 +600 @@
                         if (sock2<0) return ;
                 }
-                sendStunRequest(sock1,(struct sockaddr*)&ss,ss_len,1);
-                if (sock2>=0)
-                        sendStunRequest(sock2,(struct sockaddr*)&ss,ss_len,2);
-                
+                sendStunRequest(sock1,(struct sockaddr*)&ss,ss_len,11,TRUE);
+                sendStunRequest(sock1,(struct sockaddr*)&ss,ss_len,1,FALSE);
+                if (sock2>=0){
+                        sendStunRequest(sock2,(struct sockaddr*)&ss,ss_len,22,TRUE);
+                        sendStunRequest(sock2,(struct sockaddr*)&ss,ss_len,2,FALSE);
+                }
                 got_audio=FALSE;
                 got_video=FALSE;
@@ -607 +611 @@
                 do{
                         double elapsed;
+                        int id;
 #ifdef WIN32
                         Sleep(10);
@@ -614 +619 @@
 
                         if (recvStunResponse(sock1,call->audio_params.natd_addr,
-                                                &call->audio_params.natd_port)>0){
+                                                &call->audio_params.natd_port,&id)>0){
                                 ms_message("STUN test result: local audio port maps to %s:%i",
                                                 call->audio_params.natd_addr,
                                                 call->audio_params.natd_port);
+                                if (id==11)
+                                        cone_audio=TRUE;
                                 got_audio=TRUE;
                         }
                         if (recvStunResponse(sock2,call->video_params.natd_addr,
-                                                        &call->video_params.natd_port)>0){
+                                                        &call->video_params.natd_port,&id)>0){
                                 ms_message("STUN test result: local video port maps to %s:%i",
                                         call->video_params.natd_addr,
                                         call->video_params.natd_port);
+                                if (id==22)
+                                        cone_video=TRUE;
                                 got_video=TRUE;
                         }
@@ -633 +642 @@
                 if (!got_audio){
                         ms_error("No stun server response for audio port.");
-                }
-                if (!got_video && sock2>=0){
-                        ms_error("No stun server response for video port.");
+                }else{
+                        if (!cone_audio) {
+                                ms_warning("NAT is symmetric for audio port");
+                                call->audio_params.natd_port=0;
+                        }
+                }
+                if (sock2>=0){
+                        if (!got_video){
+                                ms_error("No stun server response for video port.");
+                        }else{
+                                if (!cone_video) {
+                                        ms_warning("NAT is symmetric for video port.");
+                                        call->video_params.natd_port=0;
+                                }
+                        }
                 }
                 close_socket(sock1);

linphone/gtk-glade/main.c

@@ -667 +667 @@
 void linphone_gtk_close(){
         /* couldn't find a way to prevent closing to destroy the main window*/
-        linphone_core_enable_video_preview(linphone_gtk_get_core(),FALSE);
+        LinphoneCore *lc=linphone_gtk_get_core();
+        /*shutdown call if any*/
+        if (linphone_core_in_call(lc))
+                linphone_core_terminate_call(lc,NULL);
+        linphone_core_enable_video_preview(lc,FALSE);
         the_ui=NULL;
         the_ui=linphone_gtk_create_window("main");

linphone/m4/exosip.m4

@@ -9 +9 @@
 
 CPPFLAGS_save=$CPPFLAGS
-CPPFLAGS=$OSIP_CFLAGS
+CPPFLAGS="$OSIP_CFLAGS $CPPFLAGS"
 AC_CHECK_HEADER([eXosip2/eXosip.h], ,AC_MSG_ERROR([Could not find eXosip2 headers !]))
 CPPFLAGS=$CPPFLAGS_save