Jehan Monnier
|
2d49bfd8be
|
finalize call transfert implementation
|
2013-02-21 14:53:37 +01:00 |
|
Yann Diorcet
|
d837794192
|
Merge branch 'master' of git.linphone.org:linphone into belle-sip
|
2013-02-21 11:58:09 +01:00 |
|
Jehan Monnier
|
abc0561441
|
make sure local ip is only guessed by core in case of upnp
|
2013-02-21 11:08:52 +01:00 |
|
Simon Morlat
|
afa99dbf01
|
update ms2
|
2013-02-20 18:22:01 +01:00 |
|
Jehan Monnier
|
7da04a1a9e
|
fix upnp and better contact management
|
2013-02-20 17:54:17 +01:00 |
|
Simon Morlat
|
5888b4dd7e
|
update ms2
|
2013-02-20 14:33:19 +01:00 |
|
diagne
|
318aec6ba7
|
Merge branch 'belle-sip' of git.linphone.org:linphone-private into belle-sip
|
2013-02-20 12:32:49 +01:00 |
|
Jehan Monnier
|
f22fe042e6
|
make sure only INVITE message invoke call_received in dialog state NULL
|
2013-02-20 11:44:47 +01:00 |
|
Yann Diorcet
|
5b14c78bbd
|
Add sal_op_call_transfer.c to android build
|
2013-02-20 10:34:12 +01:00 |
|
Simon Morlat
|
87906bd74c
|
update ms2
|
2013-02-19 17:50:50 +01:00 |
|
Simon Morlat
|
b8eff5b034
|
improve echo calibration
add mising declineCall() method to java api.
|
2013-02-19 17:45:48 +01:00 |
|
diagne
|
7e30bfb239
|
Merge branch 'belle-sip' of git.linphone.org:linphone-private into belle-sip
|
2013-02-19 16:24:01 +01:00 |
|
Jehan Monnier
|
4b8311518b
|
Merge remote-tracking branch 'public/master' into belle-sip
|
2013-02-19 16:21:02 +01:00 |
|
Yann Diorcet
|
685a0b310f
|
Fix uPnP dead lock
|
2013-02-19 16:20:17 +01:00 |
|
Yann Diorcet
|
61e01c6bc1
|
Disable keep alive when using uPnP
|
2013-02-19 16:07:58 +01:00 |
|
root
|
f092c90b73
|
Merge branch 'belle-sip' of git.linphone.org:linphone-private into belle-sip
|
2013-02-19 16:05:32 +01:00 |
|
Jehan Monnier
|
956935274f
|
Merge remote-tracking branch 'public/master' into belle-sip
|
2013-02-19 15:56:44 +01:00 |
|
Jehan Monnier
|
5737db3986
|
implement attended transfert
|
2013-02-19 15:55:09 +01:00 |
|
Yann Diorcet
|
9cb68a7d8d
|
Disable ping options when uPnP is working
|
2013-02-19 15:07:10 +01:00 |
|
Yann Diorcet
|
3694186ac9
|
Add configurable delay timeout for ice/upnp
|
2013-02-19 11:21:20 +01:00 |
|
diagne
|
21f311e49a
|
Merge branch 'belle-sip' of git.linphone.org:linphone-private into belle-sip
|
2013-02-18 16:21:24 +01:00 |
|
Jehan Monnier
|
85c3a63480
|
fix wrong merge
|
2013-02-18 16:20:48 +01:00 |
|
Jehan Monnier
|
0242451dde
|
Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
coreapi/linphonecore.c
coreapi/proxy.c
mediastreamer2
|
2013-02-18 16:15:12 +01:00 |
|
Jehan Monnier
|
3fd27c09c8
|
fix compilation issue
|
2013-02-18 16:10:56 +01:00 |
|
Jehan Monnier
|
b7c0c35102
|
continue transfer implemenation
|
2013-02-18 15:57:19 +01:00 |
|
Yann Diorcet
|
e546e97a35
|
Fix memory leak on linphone core unfree variables
|
2013-02-18 15:00:19 +01:00 |
|
Yann Diorcet
|
be6165d861
|
Fix uPnP issues. Correct registration and update with uPnP
|
2013-02-18 14:59:48 +01:00 |
|
Yann Diorcet
|
5017c6ebba
|
Improve uPnP behaviour (Firewall policy change, local ip change, ...)
Hide uPnP firewall setting if uPnP is not available
|
2013-02-18 11:59:37 +01:00 |
|
Yann Diorcet
|
e3c60a69c8
|
Update REGISTER contact with uPnP external informations
|
2013-02-18 11:57:06 +01:00 |
|
Jehan Monnier
|
615fb7ad5d
|
continue call transfer impl
|
2013-02-15 18:47:46 +01:00 |
|
Simon Morlat
|
4ab5ec9232
|
API fixups and cleanups.
|
2013-02-15 14:21:34 +01:00 |
|
Jehan Monnier
|
62cc1e417b
|
fix OPTIONS
|
2013-02-15 12:09:59 +01:00 |
|
Jehan Monnier
|
f6f2381a09
|
start call transfert, fix upnp crash, imp[lement incoming OPTION
|
2013-02-15 11:32:42 +01:00 |
|
Yann Diorcet
|
93f5931bfb
|
Merge branch 'master' of git.linphone.org:linphone into belle-sip
Conflicts:
build/android/common.mk
build/android/config.h
|
2013-02-13 17:21:37 +01:00 |
|
Jehan Monnier
|
607af68f42
|
add upnp status to configure.ac
|
2013-02-13 16:53:54 +01:00 |
|
Yann Diorcet
|
04fef5fcca
|
Add libupnp dependency for Android
Fix some issues related to uPnP
|
2013-02-13 16:51:50 +01:00 |
|
Jehan Monnier
|
7545582ab8
|
only check upnp state if upnp is configured
|
2013-02-13 16:28:20 +01:00 |
|
Jehan Monnier
|
a177101b55
|
fix cseq not incremented in case of 401/407 response
|
2013-02-13 16:11:56 +01:00 |
|
Yann Diorcet
|
3610297d37
|
Add warning when trying to set uPnP as firewall policy and uPnP is not available
|
2013-02-13 12:20:45 +01:00 |
|
Yann Diorcet
|
f90176b636
|
Merge branch 'master' into belle-sip
|
2013-02-13 11:57:42 +01:00 |
|
Yann Diorcet
|
ee6366003f
|
Fix loop in upnp context release
Add upnp public function
Add upnp jni
Improve uPnP support when a device is removed
|
2013-02-13 11:55:05 +01:00 |
|
Jehan Monnier
|
4fe21b2fe7
|
fix linux compilation issue
|
2013-02-12 18:09:36 +01:00 |
|
Simon Morlat
|
691f8c3047
|
update ms2
|
2013-02-12 15:10:23 +01:00 |
|
Yann Diorcet
|
63fa87209c
|
Merge branch 'master' into belle-sip
|
2013-02-12 14:14:58 +01:00 |
|
Yann Diorcet
|
e059e01097
|
Remove proxy & auth clear at core start in jni
|
2013-02-12 14:13:53 +01:00 |
|
Yann Diorcet
|
75e3408837
|
Merge branch 'master' into belle-sip
|
2013-02-12 13:17:56 +01:00 |
|
Yann Diorcet
|
bdf69fd48c
|
Add lpconfig sync jni
|
2013-02-12 12:54:53 +01:00 |
|
Yann Diorcet
|
922851412e
|
Merge branch 'master' of git.linphone.org:linphone into belle-sip
|
2013-02-12 10:34:54 +01:00 |
|
Jehan Monnier
|
ba1318d8cb
|
add conferencing test
|
2013-02-11 18:16:40 +01:00 |
|
Ghislain MARY
|
47a02f34fd
|
Update ms2 submodule for android sound module fix on tablets.
|
2013-02-11 12:11:50 +01:00 |
|