From 041a3165fda9a085084d9beab0895638fa206b1a Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Thu, 23 Aug 2012 11:21:22 +0200 Subject: [PATCH] Add default setting files Add audio/video port setting --- Classes/LinphoneCoreSettingsStore.m | 17 ++++- Classes/LinphoneManager.h | 4 ++ Classes/LinphoneManager.m | 77 ++++++++++++++------- Resources/linphonerc~ipad | 10 +++ Resources/linphonrc | 10 +++ Settings/InAppSettings.bundle/Network.plist | 32 +++++++++ linphone.xcodeproj/project.pbxproj | 36 ++++++---- linphonerc => linphonerc-factory | 6 -- linphonerc-ipad => linphonerc-factory~ipad | 6 -- 9 files changed, 147 insertions(+), 51 deletions(-) create mode 100644 Resources/linphonerc~ipad create mode 100644 Resources/linphonrc rename linphonerc => linphonerc-factory (81%) rename linphonerc-ipad => linphonerc-factory~ipad (80%) diff --git a/Classes/LinphoneCoreSettingsStore.m b/Classes/LinphoneCoreSettingsStore.m index 2c27099d0..5acaea706 100644 --- a/Classes/LinphoneCoreSettingsStore.m +++ b/Classes/LinphoneCoreSettingsStore.m @@ -125,6 +125,10 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); [self setString: linphone_address_get_username(parsed) forKey:@"primary_username_preference"]; } linphone_address_destroy(parsed); + } + { + [self setInteger: linphone_core_get_audio_port(lc) forKey:@"audio_port_preference"]; + [self setInteger: linphone_core_get_video_port(lc) forKey:@"video_port_preference"]; } { LCSipTransports tp; @@ -144,7 +148,7 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); [self setString:tname forKey:@"transport_preference"]; [self setInteger:port forKey:@"port_preference"]; - [self setInteger:lp_config_get_int(linphone_core_get_config(lc),"app","random_port_preference", 1) forKey:@"random_port_preference"]; + [self setInteger:lp_config_get_int(linphone_core_get_config(lc),"sip","sip_random_port", 1) forKey:@"random_port_preference"]; } { LinphoneAuthInfo *ai; @@ -291,8 +295,9 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); [LinphoneLogger logc:LinphoneLoggerError format:"cannot set transport"]; } } - lp_config_set_int(linphone_core_get_config(lc),"app","random_port_preference",random_port_preference); - + lp_config_set_int(linphone_core_get_config(lc),"sip","sip_random_port", random_port_preference); + lp_config_set_int(linphone_core_get_config(lc),"sip","sip_tcp_random_port", random_port_preference); + lp_config_set_int(linphone_core_get_config(lc),"sip","sip_tls_random_port", random_port_preference); //configure sip account @@ -464,6 +469,12 @@ extern void linphone_iphone_log_handler(int lev, const char *fmt, va_list args); linphone_address_destroy(parsed); } + + // Audio & Video Port + int audio_port_preference = [self integerForKey:@"audio_port_preference"]; + linphone_core_set_audio_port(lc, audio_port_preference); + int video_port_preference = [self integerForKey:@"video_port_preference"]; + linphone_core_set_audio_port(lc, video_port_preference); UIDevice* device = [UIDevice currentDevice]; bool backgroundSupported = false; diff --git a/Classes/LinphoneManager.h b/Classes/LinphoneManager.h index 997ee7c45..f242163f9 100644 --- a/Classes/LinphoneManager.h +++ b/Classes/LinphoneManager.h @@ -111,6 +111,10 @@ typedef struct _LinphoneManagerSounds { - (void)addInhibitedEvent:(NSString*)event; - (BOOL)removeInhibitedEvent:(NSString*)event; ++ (BOOL)copyFile:(NSString*)src destination:(NSString*)dst override:(BOOL)override; ++ (NSString*)bundleFile:(NSString*)file; ++ (NSString*)documentFile:(NSString*)file; + - (void)call:(NSString *)address displayName:(NSString*)displayName transfer:(BOOL)transfer; @property (nonatomic, retain) id settingsStore; diff --git a/Classes/LinphoneManager.m b/Classes/LinphoneManager.m index 0c999466c..01d6a5aec 100644 --- a/Classes/LinphoneManager.m +++ b/Classes/LinphoneManager.m @@ -199,6 +199,7 @@ struct codec_name_pref_table codec_pref_table[]={ settingsStore = nil; self.defaultExpires = 600; [self openDatabase]; + [self copyDefaultSettings]; } return self; } @@ -223,30 +224,12 @@ struct codec_name_pref_table codec_pref_table[]={ #pragma mark - Database Functions - (void)openDatabase { - NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); - NSString *documentsPath = [paths objectAtIndex:0]; - NSString *databaseDocumentPath = [documentsPath stringByAppendingPathComponent:@"database.txt"]; + NSString *src = [LinphoneManager bundleFile:@"database.sqlite"]; + NSString *dst = [LinphoneManager documentFile:@"database.sqlite"]; + [LinphoneManager copyFile:src destination:dst override:FALSE]; - // Copy default database - NSFileManager *fileManager = [NSFileManager defaultManager]; - NSError *error = nil; - //[fileManager removeItemAtPath:databaseDocumentPath error:&error]; //TODO REMOVE - if ([fileManager fileExistsAtPath:databaseDocumentPath] == NO) { - [LinphoneLogger logc:LinphoneLoggerLog format:"Create sqlite3 database"]; - NSString *resourceDocumentPath = [[NSBundle mainBundle] pathForResource:@"database" ofType:@"sqlite"]; - if ([fileManager fileExistsAtPath:resourceDocumentPath] == NO) { - [LinphoneLogger log:LinphoneLoggerError format:@"Can't find original database: %@", [error localizedDescription]]; - return; - } - [fileManager copyItemAtPath:resourceDocumentPath toPath:databaseDocumentPath error:&error]; - if(error != nil) { - [LinphoneLogger log:LinphoneLoggerError format:@"Can't copy database: %@", [error localizedDescription]]; - return; - } - } - - if(sqlite3_open([databaseDocumentPath UTF8String], &database) != SQLITE_OK) { - [LinphoneLogger log:LinphoneLoggerError format:@"Can't open \"%@\" sqlite3 database.", databaseDocumentPath]; + if(sqlite3_open([dst UTF8String], &database) != SQLITE_OK) { + [LinphoneLogger log:LinphoneLoggerError format:@"Can't open \"%@\" sqlite3 database.", dst]; } } @@ -566,7 +549,7 @@ static LinphoneCoreVTable linphonec_vtable = { //get default config from bundle NSBundle* myBundle = [NSBundle mainBundle]; - NSString* factoryConfig = [myBundle pathForResource:[LinphoneManager runningOnIpad]?@"linphonerc-ipad":@"linphonerc" ofType:nil] ; + NSString* factoryConfig = [myBundle pathForResource:[LinphoneManager runningOnIpad]?@"linphonerc-factory~ipad":@"linphonerc-factory" ofType:nil] ; NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); NSString *confiFileName = [[paths objectAtIndex:0] stringByAppendingString:@"/.linphonerc"]; NSString *zrtpSecretsFileName = [[paths objectAtIndex:0] stringByAppendingString:@"/zrtp_secrets"]; @@ -803,6 +786,12 @@ static LinphoneCoreVTable linphonec_vtable = { } +- (void)copyDefaultSettings { + NSString *src = [LinphoneManager bundleFile:[LinphoneManager runningOnIpad]?@"linphonerc~ipad":@"linphonerc"]; + NSString *dst = [LinphoneManager documentFile:@".linphonerc"]; + [LinphoneManager copyFile:src destination:dst override:FALSE]; +} + #pragma mark - Speaker Functions - (void)enableSpeaker:(BOOL)enable { @@ -940,4 +929,44 @@ static LinphoneCoreVTable linphonec_vtable = { return FALSE; } + +#pragma mark - Misc Functions + ++ (NSString*)bundleFile:(NSString*)file { + return [[NSBundle mainBundle] pathForResource:[file stringByDeletingPathExtension] ofType:[file pathExtension]]; +} + ++ (NSString*)documentFile:(NSString*)file { + NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES); + NSString *documentsPath = [paths objectAtIndex:0]; + return [documentsPath stringByAppendingPathComponent:file]; +} + ++ (BOOL)copyFile:(NSString*)src destination:(NSString*)dst override:(BOOL)override { + NSFileManager *fileManager = [NSFileManager defaultManager]; + NSError *error = nil; + if ([fileManager fileExistsAtPath:dst] == YES) { + if(override) { + [fileManager removeItemAtPath:dst error:&error]; + if(error != nil) { + [LinphoneLogger log:LinphoneLoggerError format:@"Can't remove \"%@\": %@", dst, [error localizedDescription]]; + return FALSE; + } + } else { + [LinphoneLogger log:LinphoneLoggerWarning format:@"\"%@\" already exists", dst]; + return FALSE; + } + } + if ([fileManager fileExistsAtPath:src] == NO) { + [LinphoneLogger log:LinphoneLoggerError format:@"Can't find \"%@\": %@", src, [error localizedDescription]]; + return FALSE; + } + [fileManager copyItemAtPath:src toPath:dst error:&error]; + if(error != nil) { + [LinphoneLogger log:LinphoneLoggerError format:@"Can't copy \"%@\" to \"%@\": %@", src, dst, [error localizedDescription]]; + return FALSE; + } + return TRUE; +} + @end diff --git a/Resources/linphonerc~ipad b/Resources/linphonerc~ipad new file mode 100644 index 000000000..10c2a12a9 --- /dev/null +++ b/Resources/linphonerc~ipad @@ -0,0 +1,10 @@ +[sip] +sip_random_port=1 +sip_tcp_random_port=1 +sip_tls_random_port=1 +contact=sip:toto@unknown-host +keepalive_period=30000 + +[rtp] +audio_rtp_port=7076 +video_rtp_port=9078 \ No newline at end of file diff --git a/Resources/linphonrc b/Resources/linphonrc new file mode 100644 index 000000000..10c2a12a9 --- /dev/null +++ b/Resources/linphonrc @@ -0,0 +1,10 @@ +[sip] +sip_random_port=1 +sip_tcp_random_port=1 +sip_tls_random_port=1 +contact=sip:toto@unknown-host +keepalive_period=30000 + +[rtp] +audio_rtp_port=7076 +video_rtp_port=9078 \ No newline at end of file diff --git a/Settings/InAppSettings.bundle/Network.plist b/Settings/InAppSettings.bundle/Network.plist index c8a4ac946..d4b181699 100644 --- a/Settings/InAppSettings.bundle/Network.plist +++ b/Settings/InAppSettings.bundle/Network.plist @@ -64,6 +64,38 @@ DefaultValue 5060 + + Key + audio_port_preference + Title + Audio Port + Type + PSTextFieldSpecifier + AutocapitalizationType + None + AutocorrectionType + No + KeyboardType + NumberPad + DefaultValue + 7076 + + + Key + video_port_preference + Title + Video Port + Type + PSTextFieldSpecifier + AutocapitalizationType + None + AutocorrectionType + No + KeyboardType + NumberPad + DefaultValue + 9078 + DefaultValue udp diff --git a/linphone.xcodeproj/project.pbxproj b/linphone.xcodeproj/project.pbxproj index 7c435be7b..33fbf5011 100755 --- a/linphone.xcodeproj/project.pbxproj +++ b/linphone.xcodeproj/project.pbxproj @@ -50,7 +50,7 @@ 226F2ED81344B0EF00F6EF27 /* libmsamr.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 226F2ED51344B0EF00F6EF27 /* libmsamr.a */; }; 2274401A106F31BD006EC466 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22744019106F31BD006EC466 /* CoreAudio.framework */; }; 2274402F106F335E006EC466 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2274402E106F335E006EC466 /* AudioToolbox.framework */; }; - 2274550810700509006EC466 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc */; }; + 2274550810700509006EC466 /* linphonerc-factory in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc-factory */; }; 228697C411AC29B800E9E0CA /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 228697C311AC29B800E9E0CA /* CFNetwork.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; 22968A5F12F875C600588287 /* UISpeakerButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 22968A5E12F875C600588287 /* UISpeakerButton.m */; }; 22A10F3B11F8960300373793 /* libortp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 220FAD2C10765B400068D98F /* libortp.a */; }; @@ -121,7 +121,7 @@ 34075199150645A300B89C47 /* CoreTelephony.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340751961506459A00B89C47 /* CoreTelephony.framework */; }; 340751E7150F38FD00B89C47 /* UIVideoButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 340751E6150F38FD00B89C47 /* UIVideoButton.m */; }; 340751E8150F38FD00B89C47 /* UIVideoButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 340751E6150F38FD00B89C47 /* UIVideoButton.m */; }; - 341FCA8E149798210084BC26 /* linphonerc-ipad in Resources */ = {isa = PBXBuildFile; fileRef = 341FCA8D149798210084BC26 /* linphonerc-ipad */; }; + 341FCA8E149798210084BC26 /* linphonerc-factory~ipad in Resources */ = {isa = PBXBuildFile; fileRef = 341FCA8D149798210084BC26 /* linphonerc-factory~ipad */; }; 34216F401547EBCD00EA9777 /* VideoZoomHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */; }; 34216F411547EBCD00EA9777 /* VideoZoomHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */; }; 344ABDE81484E723007420B6 /* libzrtpcpp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 344ABDE71484E723007420B6 /* libzrtpcpp.a */; }; @@ -186,6 +186,10 @@ D3211BBE159CBFD60098460B /* back_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3211BBB159CBFD60098460B /* back_default.png */; }; D3211BC0159CBFD70098460B /* back_disabled.png in Resources */ = {isa = PBXBuildFile; fileRef = D3211BBC159CBFD60098460B /* back_disabled.png */; }; D3211BC2159CBFD70098460B /* back_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3211BBD159CBFD60098460B /* back_over.png */; }; + D321FF9615E628BB0098B5F4 /* linphonrc in Resources */ = {isa = PBXBuildFile; fileRef = D321FF9515E628BB0098B5F4 /* linphonrc */; }; + D321FF9715E628BB0098B5F4 /* linphonrc in Resources */ = {isa = PBXBuildFile; fileRef = D321FF9515E628BB0098B5F4 /* linphonrc */; }; + D321FF9915E628CB0098B5F4 /* linphonerc~ipad in Resources */ = {isa = PBXBuildFile; fileRef = D321FF9815E628CB0098B5F4 /* linphonerc~ipad */; }; + D321FF9A15E628CB0098B5F4 /* linphonerc~ipad in Resources */ = {isa = PBXBuildFile; fileRef = D321FF9815E628CB0098B5F4 /* linphonerc~ipad */; }; D32409C3158B49A600C8C119 /* UILongTouchButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D32409C2158B49A600C8C119 /* UILongTouchButton.m */; }; D32409C4158B49A600C8C119 /* UILongTouchButton.m in Sources */ = {isa = PBXBuildFile; fileRef = D32409C2158B49A600C8C119 /* UILongTouchButton.m */; }; D32460E6159D9AAD00BA7F3A /* UITransparentView.m in Sources */ = {isa = PBXBuildFile; fileRef = D32460E5159D9AAD00BA7F3A /* UITransparentView.m */; }; @@ -449,8 +453,8 @@ D34BD6A215C13DB70070C209 /* linphone-banner.png in Resources */ = {isa = PBXBuildFile; fileRef = 225CB2F911ABB76400628906 /* linphone-banner.png */; }; D34BD6A415C13DB70070C209 /* linphone_icon_57.png in Resources */ = {isa = PBXBuildFile; fileRef = 22058C70116E305000B08DDD /* linphone_icon_57.png */; }; D34BD6A515C13DB70070C209 /* linphone_icon_72.png in Resources */ = {isa = PBXBuildFile; fileRef = 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */; }; - D34BD6A615C13DB70070C209 /* linphonerc in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc */; }; - D34BD6A715C13DB70070C209 /* linphonerc-ipad in Resources */ = {isa = PBXBuildFile; fileRef = 341FCA8D149798210084BC26 /* linphonerc-ipad */; }; + D34BD6A615C13DB70070C209 /* linphonerc-factory in Resources */ = {isa = PBXBuildFile; fileRef = 2274550710700509006EC466 /* linphonerc-factory */; }; + D34BD6A715C13DB70070C209 /* linphonerc-factory~ipad in Resources */ = {isa = PBXBuildFile; fileRef = 341FCA8D149798210084BC26 /* linphonerc-factory~ipad */; }; D34BD6A815C13DB70070C209 /* list_delete_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D3EA5416159858A80037DC6B /* list_delete_default.png */; }; D34BD6A915C13DB70070C209 /* list_delete_over.png in Resources */ = {isa = PBXBuildFile; fileRef = D3EA5417159858A80037DC6B /* list_delete_over.png */; }; D34BD6AA15C13DB70070C209 /* list_details_default.png in Resources */ = {isa = PBXBuildFile; fileRef = D354981815876FE7000081D8 /* list_details_default.png */; }; @@ -1356,7 +1360,7 @@ 2274402E106F335E006EC466 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; }; 22744043106F33FC006EC466 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 22744056106F9BC9006EC466 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; - 2274550710700509006EC466 /* linphonerc */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = linphonerc; sourceTree = ""; }; + 2274550710700509006EC466 /* linphonerc-factory */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; path = "linphonerc-factory"; sourceTree = ""; }; 228697C311AC29B800E9E0CA /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; }; 22968A5D12F875C600588287 /* UISpeakerButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UISpeakerButton.h; sourceTree = ""; }; 22968A5E12F875C600588287 /* UISpeakerButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UISpeakerButton.m; sourceTree = ""; }; @@ -1462,7 +1466,7 @@ 340751E4150E4D0200B89C47 /* CallDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CallDelegate.h; sourceTree = ""; }; 340751E5150F38FC00B89C47 /* UIVideoButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIVideoButton.h; sourceTree = ""; }; 340751E6150F38FD00B89C47 /* UIVideoButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIVideoButton.m; sourceTree = ""; }; - 341FCA8D149798210084BC26 /* linphonerc-ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc-ipad"; sourceTree = ""; }; + 341FCA8D149798210084BC26 /* linphonerc-factory~ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "linphonerc-factory~ipad"; sourceTree = ""; }; 34216F3E1547EBCD00EA9777 /* VideoZoomHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VideoZoomHandler.h; path = LinphoneUI/VideoZoomHandler.h; sourceTree = ""; }; 34216F3F1547EBCD00EA9777 /* VideoZoomHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = VideoZoomHandler.m; path = LinphoneUI/VideoZoomHandler.m; sourceTree = ""; }; 344ABDE71484E723007420B6 /* libzrtpcpp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libzrtpcpp.a; path = "liblinphone-sdk/apple-darwin/lib/libzrtpcpp.a"; sourceTree = ""; }; @@ -1529,6 +1533,8 @@ D3211BBB159CBFD60098460B /* back_default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = back_default.png; path = Resources/back_default.png; sourceTree = ""; }; D3211BBC159CBFD60098460B /* back_disabled.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = back_disabled.png; path = Resources/back_disabled.png; sourceTree = ""; }; D3211BBD159CBFD60098460B /* back_over.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = back_over.png; path = Resources/back_over.png; sourceTree = ""; }; + D321FF9515E628BB0098B5F4 /* linphonrc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = linphonrc; path = Resources/linphonrc; sourceTree = ""; }; + D321FF9815E628CB0098B5F4 /* linphonerc~ipad */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = "linphonerc~ipad"; path = "Resources/linphonerc~ipad"; sourceTree = ""; }; D32409C1158B49A600C8C119 /* UILongTouchButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UILongTouchButton.h; sourceTree = ""; }; D32409C2158B49A600C8C119 /* UILongTouchButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UILongTouchButton.m; sourceTree = ""; }; D32460E4159D9AAD00BA7F3A /* UITransparentView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UITransparentView.h; sourceTree = ""; }; @@ -2849,8 +2855,10 @@ D33CF34815D3A03400CD4B85 /* linphone_icon_57@2x.png */, 34A6ECEA14CF13CB00460C04 /* linphone_icon_72.png */, D33CF34915D3A03400CD4B85 /* linphone_icon_72@2x.png */, - 2274550710700509006EC466 /* linphonerc */, - 341FCA8D149798210084BC26 /* linphonerc-ipad */, + 2274550710700509006EC466 /* linphonerc-factory */, + 341FCA8D149798210084BC26 /* linphonerc-factory~ipad */, + D321FF9815E628CB0098B5F4 /* linphonerc~ipad */, + D321FF9515E628BB0098B5F4 /* linphonrc */, D3EA5416159858A80037DC6B /* list_delete_default.png */, D3EA5417159858A80037DC6B /* list_delete_over.png */, D354981815876FE7000081D8 /* list_details_default.png */, @@ -3322,7 +3330,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2274550810700509006EC466 /* linphonerc in Resources */, + 2274550810700509006EC466 /* linphonerc-factory in Resources */, 22F2508F107141E100AC9B3F /* DialerViewController.xib in Resources */, 22F254811073D99800AC9B3F /* ringback.wav in Resources */, 2237D4091084D7A9001383EE /* ring.wav in Resources */, @@ -3334,7 +3342,7 @@ 2218A92612FBE1340088A667 /* FirstLoginViewController.xib in Resources */, 2214783D1386A2030020F8B8 /* Localizable.strings in Resources */, 70571E1A13FABCB000CDD3C2 /* rootca.pem in Resources */, - 341FCA8E149798210084BC26 /* linphonerc-ipad in Resources */, + 341FCA8E149798210084BC26 /* linphonerc-factory~ipad in Resources */, 34A6ECEB14CF13CB00460C04 /* linphone_icon_72.png in Resources */, D347347A1580DDF1003C7B8C /* PhoneMainView.xib in Resources */, D347347E1580E5F8003C7B8C /* history_default.png in Resources */, @@ -3756,6 +3764,8 @@ D30BBD1815D402A7000F93DD /* contact_ok_disabled.png in Resources */, D3804E6015D92A57008072A5 /* msg.caf in Resources */, D3804E6215D92A57008072A5 /* msg.wav in Resources */, + D321FF9615E628BB0098B5F4 /* linphonrc in Resources */, + D321FF9915E628CB0098B5F4 /* linphonerc~ipad in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -3929,8 +3939,8 @@ D34BD6A215C13DB70070C209 /* linphone-banner.png in Resources */, D34BD6A415C13DB70070C209 /* linphone_icon_57.png in Resources */, D34BD6A515C13DB70070C209 /* linphone_icon_72.png in Resources */, - D34BD6A615C13DB70070C209 /* linphonerc in Resources */, - D34BD6A715C13DB70070C209 /* linphonerc-ipad in Resources */, + D34BD6A615C13DB70070C209 /* linphonerc-factory in Resources */, + D34BD6A715C13DB70070C209 /* linphonerc-factory~ipad in Resources */, D34BD6A815C13DB70070C209 /* list_delete_default.png in Resources */, D34BD6A915C13DB70070C209 /* list_delete_over.png in Resources */, D34BD6AA15C13DB70070C209 /* list_details_default.png in Resources */, @@ -4197,6 +4207,8 @@ D30BBD1915D402A7000F93DD /* contact_ok_disabled.png in Resources */, D3804E6115D92A57008072A5 /* msg.caf in Resources */, D3804E6315D92A57008072A5 /* msg.wav in Resources */, + D321FF9715E628BB0098B5F4 /* linphonrc in Resources */, + D321FF9A15E628CB0098B5F4 /* linphonerc~ipad in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/linphonerc b/linphonerc-factory similarity index 81% rename from linphonerc rename to linphonerc-factory index 3ee1f3d0b..d69466a06 100644 --- a/linphonerc +++ b/linphonerc-factory @@ -5,11 +5,7 @@ firewall_policy=0 mtu=1300 [sip] -sip_random_port=1 -sip_tcp_random_port=1 -sip_tls_random_port=1 guess_hostname=1 -contact=sip:toto@unknown-host inc_timeout=15 use_info=0 use_ipv6=0 @@ -18,8 +14,6 @@ auto_net_state_mon=0 keepalive_period=30000 [rtp] -audio_rtp_port=7076 -video_rtp_port=9078 audio_jitt_comp=60 video_jitt_comp=60 nortp_timeout=30 diff --git a/linphonerc-ipad b/linphonerc-factory~ipad similarity index 80% rename from linphonerc-ipad rename to linphonerc-factory~ipad index 19eb4dddf..ca50942ac 100644 --- a/linphonerc-ipad +++ b/linphonerc-factory~ipad @@ -5,11 +5,7 @@ firewall_policy=0 mtu=1300 [sip] -sip_random_port=1 -sip_tcp_random_port=1 -sip_tls_random_port=1 guess_hostname=1 -contact=sip:toto@unknown-host inc_timeout=15 use_info=0 use_ipv6=0 @@ -18,8 +14,6 @@ auto_net_state_mon=0 keepalive_period=30000 [rtp] -audio_rtp_port=7076 -video_rtp_port=9078 audio_jitt_comp=60 video_jitt_comp=60 nortp_timeout=30