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

Merge branch 'master' of git.linphone.org:linphone

Browse source
This commit is contained in:
Yann Diorcet 2012-03-20 11:55:33 +01:00
commit ea56f1a6ee
7 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
console/commands.c
View file

@ -640,7 +640,7 @@ lpc_cmd_transfer(LinphoneCore *lc, char *args)
char arg1[256]={0};
char arg2[266]={0};
long id2=0;
int n=sscanf(args,"%s %s %li",arg1,arg2,&id2);
int n=sscanf(args,"%255s %265s %li",arg1,arg2,&id2);
if (n==1 || isalpha(*arg1)){
call=linphone_core_get_current_call(lc);
if (call==NULL && ms_list_size(linphone_core_get_calls(lc))==1){
@ -1898,7 +1898,7 @@ static int lpc_cmd_register(LinphoneCore *lc, char *args){
return 1;
}
passwd[0]=proxy[0]=identity[0]='\0';
sscanf(args,"%s %s %s",identity,proxy,passwd);
sscanf(args,"%511s %511s %511s",identity,proxy,passwd);
if (proxy[0]=='\0' || identity[0]=='\0'){
linphonec_out("Missing parameters, see help register\n");
return 1;
@ -2054,7 +2054,7 @@ static int lpc_cmd_param(LinphoneCore *lc, char *args)
if (args == NULL) {
return 0;
}
switch (sscanf(args,"%s %s %s",section,param,value)) {
switch (sscanf(args,"%19s %19s %49s",section,param,value)) {
// case 1 might show all current settings under a section
case 2:
string = lp_config_get_string(linphone_core_get_config(lc), section, param, "(undef)");
@ -2086,7 +2086,7 @@ static int lpc_cmd_speak(LinphoneCore *lc, char *args){
if (!args) return 0;
memset(voice,0,sizeof(voice));
sscanf(args,"%s63",voice);
sscanf(args,"%63s",voice);
sentence=args+strlen(voice);
wavfile=tempnam("/tmp/","linphonec-espeak-");
snprintf(cl,sizeof(cl),"espeak -v %s -s 100 -w %s --stdin",voice,wavfile);
@ -2337,7 +2337,7 @@ static int _lpc_cmd_video_window(LinphoneCore *lc, char *args, bool_t is_preview
VideoParams *params=is_preview ? &lpc_preview_params : &lpc_video_params;
if (!args) return 0;
err=sscanf(args,"%s %i %i",subcommand,&a,&b);
err=sscanf(args,"%63s %i %i",subcommand,&a,&b);
if (err>=1){
if (strcmp(subcommand,"pos")==0){
if (err<3) return 0;

2
coreapi/TunnelManager.cc
View file

@ -162,7 +162,7 @@ void TunnelManager::start() {
if (!mTunnelClient) {
mTunnelClient = new TunnelClient();
mTunnelClient->setCallback((StateCallback)tunnelCallback,this);
std::list<ServerAddr>::iterator it;
list<ServerAddr>::iterator it;
for(it=mServerAddrs.begin();it!=mServerAddrs.end();++it){
const ServerAddr &addr=*it;
mTunnelClient->addServer(addr.mAddr.c_str(), addr.mPort);

1
coreapi/callbacks.c
View file

@ -243,6 +243,7 @@ static void call_received(SalOp *h){
if (propose_early_media || ringback_tone!=NULL){
linphone_call_set_state(call,LinphoneCallIncomingEarlyMedia,"Incoming call early media");
md=sal_call_get_final_media_description(h);
linphone_core_update_streams(lc,call,md);
}
if (sal_call_get_replaces(call->op)!=NULL && lp_config_get_int(lc->config,"sip","auto_answer_replacing_calls",1)){

4
coreapi/linphonecore.c
View file

@ -4041,6 +4041,10 @@ void *linphone_core_get_user_data(LinphoneCore *lc){
return lc->data;
}
void linphone_core_set_user_data(LinphoneCore *lc, void *userdata){
lc->data=userdata;
}
int linphone_core_get_mtu(const LinphoneCore *lc){
return lc->net_conf.mtu;
}

1
coreapi/linphonecore.h
View file

@ -1026,6 +1026,7 @@ void linphone_core_enable_keep_alive(LinphoneCore* lc,bool_t enable);
bool_t linphone_core_keep_alive_enabled(LinphoneCore* lc);
void *linphone_core_get_user_data(LinphoneCore *lc);
void linphone_core_set_user_data(LinphoneCore *lc, void *userdata);
/* returns LpConfig object to read/write to the config file: usefull if you wish to extend
the config file with your own sections */

2
mediastreamer2

@ -1 +1 @@
Subproject commit 0481d7d11e445bf04b095f4adc6d3b76f9e86ee2
Subproject commit 902cd8d36daef0913ac235b283668e5b3dbda515

2
oRTP

@ -1 +1 @@
Subproject commit 3fb614e2ed15803f2c96c223cceb5545a60f2431
Subproject commit d62fa221ed9d373427f1fda9bdbfc301f25a5141