- libswscale (part of ffmpeg too) for better scaling performance
- theora (optional)
+ if you want uPnP support:
- - libupnp
+ - libupnp (version 1.6 branch (not patched with 18-url-upnpstrings.patch))
with their corresponding -dev or -devel package if you don't use source packages.
Generate a new bundle to have it included.
+libiconv hack
+*************
+
+The Makefile.am rules used to generate the bundle fetch a libiconv.2.dylib from a linphone download page.
+This library adds some additional symbols so that dependencies requiring the iconv from /usr/lib and the ones requiring from the bundle are both satisfied.
+In case this library needs to generated, here are the commands:
+ $ wget http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
+ $ cd libiconv-1.14
+ $ patch -p1 < ../linphone/build/macos/libiconv-macos.patch
+ $ ./configure --prefix=/opt/local --disable-static 'CFLAGS=-arch i386 -arch x86_64 -mmacosx-version-min=10.5' 'LDFLAGS=-arch i386 -arch x86_64 -mmacosx-version-min=10.5' CXXFLAGS="-arch i386 -arch x86_64 -mmacosx-version-min=10.5" && make
+ $ make install DESTDIR=/tmp
+
+The resulted library can be found in /tmp/opt/local/lib
+
+
+
--- /dev/null
+--- libiconv-1.14.orig/lib/iconv.c 2013-03-14 16:30:50.000000000 +0100
++++ libiconv-1.14/lib/iconv.c 2013-03-15 10:24:38.000000000 +0100
+@@ -607,4 +607,23 @@
+ strong_alias (libiconv_close, iconv_close)
+ #endif
+
++#undef iconv_open
++#undef iconv
++#undef iconv_close
++
++LIBICONV_DLL_EXPORTED iconv_t iconv_open (const char* tocode, const char* fromcode){
++ return libiconv_open(tocode,fromcode);
++}
++
++LIBICONV_DLL_EXPORTED size_t iconv (iconv_t icd,
++ ICONV_CONST char* * inbuf, size_t *inbytesleft,
++ char* * outbuf, size_t *outbytesleft){
++ return libiconv(icd,inbuf,inbytesleft,outbuf,outbytesleft);
++}
++
++LIBICONV_DLL_EXPORTED int iconv_close (iconv_t icd){
++ return libiconv_close(icd);
++}
++
++
+ #endif
)
if test "$build_upnp" != "false" ; then
- PKG_CHECK_MODULES([LIBUPNP], [libupnp], [build_upnp=true],
+ PKG_CHECK_MODULES([LIBUPNP], [libupnp],
+ [if pkg-config --atleast-version=1.6 "libupnp < 1.7"; then
+ build_upnp=true
+ else
+ AC_MSG_ERROR([libupnp >= 1.6 < 1.5 required.])
+ fi],
[if test "$build_upnp" == "true" ; then
AC_MSG_ERROR([libupnp not found.])
else
dnl setup flags for exosip library
LP_SETUP_EXOSIP
-dnl check exosip support of DSCP in exosip
-AC_MSG_CHECKING([for DSCP support in exosip])
-AC_TRY_COMPILE([#include <eXosip2/eXosip.h>],
- [int dscp=0;eXosip_set_option(EXOSIP_OPT_SET_DSCP,&dscp);],
- has_exosip_dscp=yes,
- has_exosip_dscp=no
-)
-AC_MSG_RESULT($has_exosip_dscp)
-if test "$has_exosip_dscp" = "yes" ; then
- AC_DEFINE( HAVE_EXOSIP_DSCP, 1, [Define if exosip dscp available] )
-fi
-
-
if test "$console_ui" = "true" ; then
dnl check gnu readline
LP_CHECK_READLINE
[enable_msg_storage=auto]
)
-echo "enable_msg_storage = $enable_msg_storage"
AM_CONDITIONAL(BUILD_MSG_STORAGE, test x$enable_msg_storage = xtrue)
if test x$enable_msg_storage != xfalse; then
const LinphoneCallParams *cp=linphone_call_get_current_params (call);
if (args){
linphone_call_enable_camera(call,activated);
- if ((activated && !linphone_call_params_video_enabled (cp))){
- /*update the call to add the video stream*/
- LinphoneCallParams *ncp=linphone_call_params_copy(cp);
- linphone_call_params_enable_video(ncp,TRUE);
- linphone_core_update_call(lc,call,ncp);
- linphone_call_params_destroy (ncp);
- linphonec_out("Trying to bring up video stream...\n");
+ if (linphone_call_get_state(call)==LinphoneCallStreamsRunning){
+ if ((activated && !linphone_call_params_video_enabled (cp))){
+ /*update the call to add the video stream*/
+ LinphoneCallParams *ncp=linphone_call_params_copy(cp);
+ linphone_call_params_enable_video(ncp,TRUE);
+ linphone_core_update_call(lc,call,ncp);
+ linphone_call_params_destroy (ncp);
+ linphonec_out("Trying to bring up video stream...\n");
+ }
}
}
if (linphone_call_camera_enabled (call))
bool_t send_ringbacktone=FALSE;
if (call->audiostream==NULL){
- /*this happens after pausing the call locally. The streams is destroyed and then we wait the 200Ok to recreate it*/
+ /*this happens after pausing the call locally. The streams are destroyed and then we wait the 200Ok to recreate them*/
linphone_call_init_media_streams (call);
}
if (call->state==LinphoneCallIncomingEarlyMedia && linphone_core_get_remote_ringback_tone (lc)!=NULL){
}
linphone_call_start_media_streams(call,all_muted,send_ringbacktone);
}
+ if (call->state==LinphoneCallPausing && call->paused_by_app && ms_list_size(lc->calls)==1){
+ linphone_core_play_named_tone(lc,LinphoneToneCallOnHold);
+ }
}
#if 0
static bool_t is_duplicate_call(LinphoneCore *lc, const LinphoneAddress *from, const LinphoneAddress *to){
} else if (sr == SalReasonBusy) {
call->reason=LinphoneReasonBusy;
linphone_call_set_state(call,LinphoneCallError,"User is busy.");
+ linphone_core_play_named_tone(lc,LinphoneToneBusy);
} else {
linphone_call_set_state(call,LinphoneCallError,msg);
}
}
if (call->state!=LinphoneCallPaused){
ms_message("Automatically pausing current call to accept transfer.");
- linphone_core_pause_call(lc,call);
+ _linphone_core_pause_call(lc,call);
call->was_automatically_paused=TRUE;
/*then we will start the refered when the pause is accepted, in order to serialize transactions within the dialog.
* Indeed we need to avoid to send a NOTIFY to inform about of state of the refered call while the pause isn't completed.
err=linphone_core_update_call(lc,call,&call->params);
} else{
ms_message("Pausing call to actually remove from conference");
- err=linphone_core_pause_call(lc,call);
+ err=_linphone_core_pause_call(lc,call);
}
return err;
return -1;
}
if (lc->current_call != NULL) {
- linphone_core_pause_call(lc, lc->current_call);
+ _linphone_core_pause_call(lc, lc->current_call);
}
LinphoneConference *conf=&lc->conf_ctx;
if (conf->local_participant==NULL) add_local_endpoint(conf,lc);
static void ecc_play_tones(EcCalibrator *ecc){
MSDtmfGenCustomTone tone;
MSToneDetectorDef expected_tone;
+
+ memset(&tone,0,sizeof(tone));
+ memset(&expected_tone,0,sizeof(expected_tone));
ms_filter_set_notify_callback(ecc->det,on_tone_received,ecc);
/*play an initial tone to startup the audio playback/capture*/
- tone.frequency=140;
+ tone.frequencies[0]=140;
tone.duration=1000;
tone.amplitude=0.5;
/* play the three tones*/
- tone.frequency=2000;
+ tone.frequencies[0]=2000;
tone.duration=100;
ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
ms_usleep(300000);
- tone.frequency=2300;
+ tone.frequencies[0]=2300;
tone.duration=100;
ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
ms_usleep(300000);
- tone.frequency=2500;
+ tone.frequencies[0]=2500;
tone.duration=100;
ms_filter_call_method(ecc->gen,MS_DTMF_GEN_PLAY_CUSTOM,&tone);
ms_sleep(1);
l=ms_list_append(l,pt);
md->streams[0].payloads=l;
+ // if ZRTP is enabled, put the hello hash into the audiostream's desc
+ if (call->audiostream && call->audiostream->ms.zrtp_context!=NULL){
+ ortp_zrtp_get_hello_hash(call->audiostream->ms.zrtp_context,
+ md->streams[0].zrtp_hello_hash,
+ sizeof(md->streams[0].zrtp_hello_hash));
+ ms_message("Audio stream zrtp hash: %s", md->streams[0].zrtp_hello_hash);
+ }
+
if (call->params.has_video){
md->n_active_streams++;
md->streams[1].rtp_port=call->video_port;
md->streams[1].type=SalVideo;
l=make_codec_list(lc,lc->codecs_conf.video_codecs,0,NULL,-1);
md->streams[1].payloads=l;
+ // if ZRTP is enabled, put the hello hash into the audiostream's desc
+ if (call->videostream->ms.zrtp_context!=NULL){
+ ortp_zrtp_get_hello_hash(call->videostream->ms.zrtp_context,
+ md->streams[1].zrtp_hello_hash,
+ sizeof(md->streams[1].zrtp_hello_hash));
+ ms_message("Video stream zrtp hash: %s", md->streams[1].zrtp_hello_hash);
+ }
}
if (md->n_total_streams < md->n_active_streams)
md->n_total_streams = md->n_active_streams;
void linphone_call_init_media_streams(LinphoneCall *call){
linphone_call_init_audio_stream(call);
linphone_call_init_video_stream(call);
+
+ // moved from linphone_call_start_media_streams, because ZRTP needs to be
+ // at least partially initialized so that the SDP can contain 'zrtp-hash'
+ if (call->params.media_encryption==LinphoneMediaEncryptionZRTP) {
+ OrtpZrtpParams params;
+ /*will be set later when zrtp is activated*/
+ call->current_params.media_encryption=LinphoneMediaEncryptionNone;
+
+ params.zid_file=call->core->zrtp_secrets_cache;
+ audio_stream_enable_zrtp(call->audiostream,¶ms);
+ } else if (call->params.media_encryption==LinphoneMediaEncryptionSRTP){
+ call->current_params.media_encryption=linphone_call_are_all_streams_encrypted(call) ?
+ LinphoneMediaEncryptionSRTP : LinphoneMediaEncryptionNone;
+ }
}
call->playing_ringbacktone=send_ringbacktone;
call->up_bw=linphone_core_get_upload_bandwidth(lc);
+ // ZRTP was initialized in linphone_call_init_media_streams with a
+ // partially iniitalized RtpSession, and now needs to get an update
if (call->params.media_encryption==LinphoneMediaEncryptionZRTP) {
- OrtpZrtpParams params;
- /*will be set later when zrtp is activated*/
- call->current_params.media_encryption=LinphoneMediaEncryptionNone;
-
- params.zid_file=lc->zrtp_secrets_cache;
- audio_stream_enable_zrtp(call->audiostream,¶ms);
- }else if (call->params.media_encryption==LinphoneMediaEncryptionSRTP){
- call->current_params.media_encryption=linphone_call_are_all_streams_encrypted(call) ?
- LinphoneMediaEncryptionSRTP : LinphoneMediaEncryptionNone;
+ ortp_zrtp_start_engine(call->audiostream->ms.zrtp_context,call->audiostream->ms.session);
}
/*also reflect the change if the "wished" params, in order to avoid to propose SAVP or video again
if (from)
{
snprintf(temp,sizeof(temp),"Remote end %s seems to have disconnected, the call is going to be closed.",from);
- free(from);
+ ms_free(from);
}
else
{
if (lc->vtable.display_warning!=NULL)
lc->vtable.display_warning(lc,temp);
linphone_core_terminate_call(lc,call);
+ linphone_core_play_named_tone(lc,LinphoneToneCallFailed);
}
static void handle_ice_events(LinphoneCall *call, OrtpEvent *ev){
ms_message("incoming call ringing for %i seconds",elapsed);
if (elapsed>lc->sip_conf.inc_timeout){
ms_message("incoming call timeout (%i)",lc->sip_conf.inc_timeout);
+ LinphoneReason decline_reason=lc->current_call ? LinphoneReasonBusy : LinphoneReasonDeclined;
call->log->status=LinphoneCallMissed;
call->reason=LinphoneReasonNotAnswered;
- linphone_core_terminate_call(lc,call);
+ linphone_core_decline_call(lc,call,decline_reason);
}
}
if (lc->sip_conf.in_call_timeout > 0 && elapsed>lc->sip_conf.in_call_timeout) {
}else{
/* else play a tone within the context of the current call */
call->ringing_beep=TRUE;
- linphone_core_play_tone(lc);
+ linphone_core_play_named_tone(lc,LinphoneToneCallWaiting);
}
linphone_call_set_state(call,LinphoneCallIncomingReceived,"Incoming call");
sal_call_set_local_media_description(call->op,call->localdesc);
}
- if (call->audiostream==NULL)
+ if (call->audiostream==NULL){
linphone_call_init_media_streams(call);
+ // the local media description must be regenerated after the audiostream
+ // is initialized, otherwise the ZRTP hello hash will not be available
+ linphone_call_make_local_media_description(lc,call);
+ sal_call_set_local_media_description(call->op,call->localdesc);
+ }
+
if (!was_ringing && call->audiostream->ms.ticker==NULL){
audio_stream_prepare_sound(call->audiostream,lc->sound_conf.play_sndcard,lc->sound_conf.capt_sndcard);
}
*
* @ingroup call_control
**/
-LinphoneCall *linphone_core_get_current_call(const LinphoneCore *lc)
-{
+LinphoneCall *linphone_core_get_current_call(const LinphoneCore *lc){
return lc->current_call;
}
*
* @ingroup call_control
**/
-int linphone_core_pause_call(LinphoneCore *lc, LinphoneCall *call)
+int linphone_core_pause_call(LinphoneCore *lc, LinphoneCall *call){
+ int err=_linphone_core_pause_call(lc,call);
+ if (err==0) call->paused_by_app=TRUE;
+ return err;
+}
+
+/* Internal version that does not play tone indication*/
+int _linphone_core_pause_call(LinphoneCore *lc, LinphoneCall *call)
{
const char *subject=NULL;
lc->vtable.display_status(lc,_("Pausing the current call..."));
if (call->audiostream || call->videostream)
linphone_call_stop_media_streams (call);
+ call->paused_by_app=FALSE;
return 0;
}
LinphoneCall *call=(LinphoneCall *)elem->data;
LinphoneCallState cs=linphone_call_get_state(call);
if (cs==LinphoneCallStreamsRunning || cs==LinphoneCallPausedByRemote){
- linphone_core_pause_call(lc,call);
+ _linphone_core_pause_call(lc,call);
}
}
return 0;
current_call=linphone_core_get_current_call(lc);
if(current_call != NULL){
ms_message("Pausing automatically the current call.");
- linphone_core_pause_call(lc,current_call);
+ _linphone_core_pause_call(lc,current_call);
+ }
+ if (lc->ringstream){
+ ring_stop(lc->ringstream);
+ lc->ringstream=NULL;
}
}
*
**/
void linphone_core_set_device_rotation(LinphoneCore *lc, int rotation) {
-ms_message("%s : rotation=%d\n", __FUNCTION__, rotation);
+ ms_message("%s : rotation=%d\n", __FUNCTION__, rotation);
lc->device_rotation = rotation;
#ifdef VIDEO_ENABLED
LinphoneCall *call=linphone_core_get_current_call(lc);
ms_error("No dtmf generator at this time !");
return;
}
+ memset(&def,0,sizeof(def));
def.duration=300;
- def.frequency=500;
+ def.frequencies[0]=500;
def.amplitude=1;
def.interval=2000;
ms_filter_call_method(f, MS_DTMF_GEN_PLAY_CUSTOM,&def);
}
+void linphone_core_play_named_tone(LinphoneCore *lc, LinphoneToneID toneid){
+ if (linphone_core_tone_indications_enabled(lc)){
+ MSFilter *f=get_dtmf_gen(lc);
+ MSDtmfGenCustomTone def;
+ if (f==NULL){
+ ms_error("No dtmf generator at this time !");
+ return;
+ }
+ memset(&def,0,sizeof(def));
+ def.amplitude=1;
+ /*these are french tones, excepted the failed one, which is USA congestion tone (does not exist in France)*/
+ switch(toneid){
+ case LinphoneToneCallOnHold:
+ case LinphoneToneCallWaiting:
+ def.duration=300;
+ def.frequencies[0]=440;
+ def.interval=2000;
+ break;
+ case LinphoneToneBusy:
+ def.duration=500;
+ def.frequencies[0]=440;
+ def.interval=500;
+ def.repeat_count=3;
+ break;
+ case LinphoneToneCallFailed:
+ def.duration=250;
+ def.frequencies[0]=480;
+ def.frequencies[0]=620;
+ def.interval=250;
+ def.repeat_count=3;
+
+ break;
+ default:
+ ms_warning("Unhandled tone id.");
+ }
+ if (def.duration>0)
+ ms_filter_call_method(f, MS_DTMF_GEN_PLAY_CUSTOM,&def);
+ }
+}
+
/**
* @ingroup media_parameters
*
if (pos2-pos1>=0){
/* found a pair key,value */
+
if (cur!=NULL){
LpItem *item=lp_section_find_item(cur,key);
if (item==NULL){
ms_free(item->value);
item->value=strdup(pos1);
}
- /*printf("Found %s %s={%s}\n",cur->name,key,pos1);*/
+ /*ms_message("Found %s=%s",key,pos1);*/
}else{
ms_warning("found key,item but no sections");
}
LpConfig * lp_config_new(const char *filename){
LpConfig *lpconfig=lp_new0(LpConfig,1);
if (filename!=NULL){
+ ms_message("Using (r/w) config information from %s", filename);
lpconfig->filename=ortp_strdup(filename);
lpconfig->file=fopen(filename,"rw");
if (lpconfig->file!=NULL){
int lp_config_read_file(LpConfig *lpconfig, const char *filename){
FILE* f=fopen(filename,"r");
if (f!=NULL){
+ ms_message("Reading config information from %s", filename);
lp_config_parse(lpconfig,f);
fclose(f);
return 0;
for (i = 0; i < md->n_total_streams; i++) {
const SalStreamDescription *stream = &md->streams[i];
IceCheckList *cl = ice_session_check_list(call->ice_session, i);
- if (cl == NULL) {
+ if ((cl == NULL) && (i < md->n_active_streams)) {
cl = ice_check_list_new();
ice_session_add_check_list(call->ice_session, cl);
switch (stream->type) {
return ret;
}
+bool_t linphone_core_tone_indications_enabled(LinphoneCore*lc){
+ return lp_config_get_int(lc->config,"sound","tone_indications",1);
+}
#ifdef HAVE_GETIFADDRS
result->ice_completed = local_cap->ice_completed;
memcpy(result->ice_candidates, local_cap->ice_candidates, sizeof(result->ice_candidates));
memcpy(result->ice_remote_candidates, local_cap->ice_remote_candidates, sizeof(result->ice_remote_candidates));
+ memcpy(result->zrtp_hello_hash,local_cap->zrtp_hello_hash, sizeof(result->zrtp_hello_hash));
}
/**
bool_t was_automatically_paused;
bool_t ping_replied;
bool_t record_active;
+ bool_t paused_by_app;
};
void linphone_call_background_tasks(LinphoneCall *call, bool_t one_second_elapsed);
void linphone_core_preempt_sound_resources(LinphoneCore *lc);
+int _linphone_core_pause_call(LinphoneCore *lc, LinphoneCall *call);
+
/*conferencing subsystem*/
void _post_configure_audio_stream(AudioStream *st, LinphoneCore *lc, bool_t muted);
/* When a conference participant pause the conference he may send a music.
void linphone_core_message_storage_init(LinphoneCore *lc);
void linphone_core_message_storage_close(LinphoneCore *lc);
+typedef enum _LinphoneToneID{
+ LinphoneToneBusy,
+ LinphoneToneCallWaiting,
+ LinphoneToneCallOnHold,
+ LinphoneToneCallFailed
+}LinphoneToneID;
+void linphone_core_play_named_tone(LinphoneCore *lc, LinphoneToneID id);
+bool_t linphone_core_tone_indications_enabled(LinphoneCore*lc);
+
#ifdef __cplusplus
}
#endif
} SalIceRemoteCandidate;
#define SAL_MEDIA_DESCRIPTION_MAX_ICE_REMOTE_CANDIDATES 2
-
+#define SAL_MEDIA_DESCRIPTION_MAX_ZRTP_HELLO_HASH 128
#define SAL_MEDIA_DESCRIPTION_MAX_ICE_UFRAG_LEN 256
#define SAL_MEDIA_DESCRIPTION_MAX_ICE_PWD_LEN 256
SalIceRemoteCandidate ice_remote_candidates[SAL_MEDIA_DESCRIPTION_MAX_ICE_REMOTE_CANDIDATES];
char ice_ufrag[SAL_MEDIA_DESCRIPTION_MAX_ICE_UFRAG_LEN];
char ice_pwd[SAL_MEDIA_DESCRIPTION_MAX_ICE_PWD_LEN];
+ char zrtp_hello_hash[SAL_MEDIA_DESCRIPTION_MAX_ZRTP_HELLO_HASH];
bool_t ice_mismatch;
bool_t ice_completed;
} SalStreamDescription;
#include "sal.h"
#include <eXosip2/eXosip.h>
-#define keywordcmp(key,b) strncmp(key,b,sizeof(key))
+#define keywordcmp(key,b) strcmp(key,b)
#ifdef FOR_LATER
return 0;
}
+static char * _sdp_message_get_a_zrtp_hash(sdp_message_t *sdp, int mline){
+ int i;
+ sdp_attribute_t *attr;
+ for (i=0;(attr=sdp_message_attribute_get(sdp,mline,i))!=NULL;i++){
+ if (keywordcmp("zrtp-hash",attr->a_att_field)==0){
+ return attr->a_att_value;
+ }
+ }
+ return NULL;
+}
+
static int _sdp_message_get_mline_dir(sdp_message_t *sdp, int mline){
int i;
sdp_attribute_t *attr;
int_2char(desc->bandwidth));
if (desc->ptime>0) sdp_message_a_attribute_add(msg,lineno,osip_strdup("ptime"),
int_2char(desc->ptime));
+
+ // if the ZRTP hello hash is available, create an a attribute for it
+ if (desc->zrtp_hello_hash[0])
+ sdp_message_a_attribute_add(msg,lineno,osip_strdup("zrtp-hash"), osip_strdup(desc->zrtp_hello_hash));
+
strip_well_known_rtpmaps=ms_list_size(desc->payloads)>5;
if (desc->payloads){
for(elem=desc->payloads;elem!=NULL;elem=elem->next){
int sdp_to_media_description(sdp_message_t *msg, SalMediaDescription *desc){
int i,j;
- const char *mtype,*proto,*rtp_port,*rtp_addr,*number;
+ const char *mtype,*proto,*rtp_port,*rtp_addr,*number,*zrtp_info;
const char *sess;
sdp_bandwidth_t *sbw=NULL;
sdp_attribute_t *attr;
stream->rtp_port=atoi(rtp_port);
if (stream->rtp_port > 0)
desc->n_active_streams++;
-
+
+ // if the SDP contains a zrtp-hash, add it to the StreamDesc
+ zrtp_info = _sdp_message_get_a_zrtp_hash(msg, i);
+ if (zrtp_info != NULL)
+ strncpy(stream->zrtp_hello_hash, zrtp_info, sizeof(stream->zrtp_hello_hash));
+
stream->ptime=_sdp_message_get_a_ptime(msg,i);
if (strcasecmp("audio", mtype) == 0){
stream->type=SalAudio;
for (j = 0; ((attr = sdp_message_attribute_get(msg, i, j)) != NULL); j++) {
if ((keywordcmp("rtcp", attr->a_att_field) == 0) && (attr->a_att_value != NULL)) {
char tmp[256];
- int nb = sscanf(attr->a_att_value, "%d IN IP4 %s", &stream->rtcp_port, tmp);
+ // added bounds check
+ int nb = sscanf(attr->a_att_value, "%d IN IP4 %256s", &stream->rtcp_port, tmp);
if (nb == 1) {
/* SDP rtcp attribute only contains the port */
} else if (nb == 2) {
CPPFLAGS_save=$CPPFLAGS
CPPFLAGS="$OSIP_CFLAGS $CPPFLAGS"
AC_CHECK_HEADER([eXosip2/eXosip.h], ,AC_MSG_ERROR([Could not find eXosip2 headers !]))
+
+dnl check exosip support of DSCP in exosip
+AC_MSG_CHECKING([for DSCP support in exosip])
+AC_TRY_COMPILE([#include <eXosip2/eXosip.h>],
+ [int dscp=0;eXosip_set_option(EXOSIP_OPT_SET_DSCP,&dscp);],
+ has_exosip_dscp=yes,
+ has_exosip_dscp=no
+)
+AC_MSG_RESULT($has_exosip_dscp)
+if test "$has_exosip_dscp" = "yes" ; then
+ AC_DEFINE( HAVE_EXOSIP_DSCP, 1, [Define if exosip dscp available] )
+fi
+
CPPFLAGS=$CPPFLAGS_save
-Subproject commit 28c3383b5e98196ab394f6616f11c195e6759d28
+Subproject commit 430cc1376d68b1a8d82799357abea9e3e1c536f8
-Subproject commit 20b527144f9850dd9065d96db7a20244e8a8b227
+Subproject commit c702c0ea0e66bbe1f27c79690003d9748b01560f
projects / linphone / commitdiff