mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-17 11:08:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix ring back tone

Browse source 
implement multitasking on udp socket
This commit is contained in:
Jehan Monnier 2010-06-15 14:14:19 +02:00
parent 4fa1a45038
commit 8eaf19fd17
3 changed files with 77 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Classes/linphoneAppDelegate.h
View file

@ -52,6 +52,7 @@
LinphoneCore* myLinphoneCore;
SCNetworkReachabilityContext proxyReachabilityContext;
SCNetworkReachabilityRef proxyReachability;
CFReadStreamRef mReadStream;
}

81
Classes/linphoneAppDelegate.m
View file

@ -26,6 +26,11 @@
#import "ConsoleViewController.h"
#import "MoreViewController.h"
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
extern void ms_au_register_card();
void linphone_iphone_keepAliveHandler () {
ms_message("keepalive handler invoked");
@ -98,11 +103,29 @@ LinphoneCoreVTable linphonec_vtable = {
- (void)applicationDidEnterBackground:(UIApplication *)application {
#if __IPHONE_OS_VERSION_MIN_REQUIRED >= 40000
struct addrinfo hints;
struct addrinfo *res=NULL;
int err;
LinphoneProxyConfig* proxyCfg;
LinphoneAddress *addr;
int sipsock = linphone_core_get_sip_socket(myLinphoneCore);
linphone_core_get_default_proxy(myLinphoneCore, &proxyCfg);
if (backgroundSupported && proxyCfg) {
if ([[UIApplication sharedApplication] setKeepAliveTimeout:(NSTimeInterval)linphone_proxy_config_get_expires(proxyCfg)
//first register
linphone_core_set_network_reachable(myLinphoneCore,false);
linphone_core_iterate(myLinphoneCore);
linphone_core_set_network_reachable(myLinphoneCore,true);
int i=0;
while (!linphone_proxy_config_is_registered(proxyCfg) && i++<200 ) {
linphone_core_iterate(myLinphoneCore);
usleep(100000);
}
if ([[UIApplication sharedApplication] setKeepAliveTimeout:600/*(NSTimeInterval)linphone_proxy_config_get_expires(proxyCfg)*/
handler:^{
ms_warning("keepalive handler");
linphone_core_set_network_reachable(myLinphoneCore,false);
@ -117,10 +140,38 @@ LinphoneCoreVTable linphonec_vtable = {
} else {
ms_warning("keepalive handler cannot be registered");
}
if (mReadStream == nil) {
const char *port;
addr=linphone_address_new(linphone_proxy_config_get_addr(proxyCfg));
memset(&hints,0,sizeof(hints));
hints.ai_family=linphone_core_ipv6_enabled(myLinphoneCore) ? AF_INET6 : AF_INET;
port=linphone_address_get_port(addr);
if (port==NULL) port="5060";
err=getaddrinfo(linphone_address_get_domain(addr),port,&hints,&res);
if (err!=0){
ms_error("getaddrinfo() failed for %s: %s",linphone_address_get_domain(addr),gai_strerror(err));
linphone_address_destroy(addr);
return;
}
err=connect(sipsock,res->ai_addr,res->ai_addrlen);
if (err==-1){
ms_error("Connect failed: %s",strerror(errno));
}
freeaddrinfo(res);
CFStreamCreatePairWithSocket(NULL, (CFSocketNativeHandle)sipsock, &mReadStream,nil);
if (!CFReadStreamSetProperty(mReadStream, kCFStreamNetworkServiceType, kCFStreamNetworkServiceTypeVoIP)) {
ms_error("cannot set service type to voip for read stream");
}
if (!CFReadStreamOpen(mReadStream)) {
ms_error("cannot open read stream");
}
}
}
#endif
}
@ -208,6 +259,18 @@ LinphoneCoreVTable linphonec_vtable = {
} else {
isStarted=true;
}
if (mReadStream !=nil) {
//unconnect
int socket = linphone_core_get_sip_socket(myLinphoneCore);
struct addrinfo hints;
memset(&hints,0,sizeof(hints));
hints.ai_family=AF_UNSPEC;
connect(socket,&hints,sizeof(hints));
CFReadStreamClose(mReadStream);
CFRelease(mReadStream);
mReadStream=nil;
}
}
-(void)selectDialerTab {
@ -326,6 +389,13 @@ extern void libmsilbc_init();
//initial state is network off
linphone_core_set_network_reachable(myLinphoneCore,false);
// Set audio assets
NSBundle* myBundle = [NSBundle mainBundle];
const char* lRing = [[myBundle pathForResource:@"oldphone-mono"ofType:@"wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
linphone_core_set_ring(myLinphoneCore, lRing );
const char* lRingBack = [[myBundle pathForResource:@"ringback"ofType:@"wav"] cStringUsingEncoding:[NSString defaultCStringEncoding]];
linphone_core_set_ringback(myLinphoneCore, lRingBack);
@ -409,7 +479,6 @@ extern void libmsilbc_init();
proxyReachability=SCNetworkReachabilityCreateWithName(nil, "linphone.org");
}
proxyReachabilityContext.info=self;
SCNetworkReachabilitySetCallback(proxyReachability, (SCNetworkReachabilityCallBack)networkReachabilityCallBack,&proxyReachabilityContext);
SCNetworkReachabilityScheduleWithRunLoop(proxyReachability, CFRunLoopGetCurrent(), kCFRunLoopDefaultMode);

3
linphonerc
View file

@ -5,7 +5,7 @@ firewall_policy=0
mtu=0
[sip]
sip_port=5060
sip_random_port=1
guess_hostname=1
contact=sip:toto@unknown-host
inc_timeout=15
@ -14,7 +14,6 @@ use_ipv6=0
register_only_when_network_is_up=0
default_proxy=-1
auto_net_state_mon=0
transport=udp
keepalive_period=3600000
[rtp]