diff --git a/debian/changelog b/debian/changelog index 198965bd09d1dc4d7b1a80f2989ef4d782ba0046..07720471d4796a869cbd99823765b5404a6e8474 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,44 @@ +sflphone (0.9.3-0ubuntu1) intrepid; urgency=low + + * Remove debug + * Join thread before leaving + * Fix implicit declaration in reqaccount + * Add REST code to build the request to server + * Fix GValue initialization warnings + * Update version number, fix implicit declaration, fix GTK markup + warnings + * Apply patch to create custom SIP account from our own server + + -- Emmanuel Milou Fri, 06 Feb 2009 19:17:32 -0500 + +sflphone (0.9.2-2ubuntu9) intrepid; urgency=low + + [ Alexandre Savard ] + * Speex audio codec preprocessing initialization + * peer hung up segmentation fault solved + * Stop recording when transfering + * Terminate only one call + * Add isRecording() function + * Fix call_icon GTK client + * Fix SIPCallClose() function, recorded file now close properly + * Function terminateSIPCall added in sipvoiplink and managerimpl + * Fix thread destructor + * setRecordingOption function implement in audiorecord + * Record now implemented in Call class + * Record interface complete (on hold erase previous recording) + * Added recButton in client + * Added: record button related icons + * Record button added + * Overload AudioRecord::recData to get mic and speaker data mixed + * Recording now in audiortp::run() method + * Audio recording working in AudioRTP: receiveSessionForSpeaker + * Open/close a wave file when pulse audio stream start/stop + + [ Emmanuel Milou ] + * Fix path for GTK+ icons; clean up + + -- Emmanuel Milou Thu, 05 Feb 2009 18:27:53 -0500 + sflphone (0.9.2-2ubuntu8) intrepid; urgency=low [ Emmanuel Milou ] diff --git a/debian/changelog.hardy b/debian/changelog.hardy index 1332fca808c01a52a7603693286aa925354440cd..009a6ff89b698c4c6619f79732fc1d102a145add 100644 --- a/debian/changelog.hardy +++ b/debian/changelog.hardy @@ -1,3 +1,44 @@ +sflphone (0.9.3-0ubuntu1) hardy; urgency=low + + * Remove debug + * Join thread before leaving + * Fix implicit declaration in reqaccount + * Add REST code to build the request to server + * Fix GValue initialization warnings + * Update version number, fix implicit declaration, fix GTK markup + warnings + * Apply patch to create custom SIP account from our own server + + -- Emmanuel Milou Fri, 06 Feb 2009 19:17:32 -0500 + +sflphone (0.9.2-2ubuntu9) hardy; urgency=low + + [ Alexandre Savard ] + * Speex audio codec preprocessing initialization + * peer hung up segmentation fault solved + * Stop recording when transfering + * Terminate only one call + * Add isRecording() function + * Fix call_icon GTK client + * Fix SIPCallClose() function, recorded file now close properly + * Function terminateSIPCall added in sipvoiplink and managerimpl + * Fix thread destructor + * setRecordingOption function implement in audiorecord + * Record now implemented in Call class + * Record interface complete (on hold erase previous recording) + * Added recButton in client + * Added: record button related icons + * Record button added + * Overload AudioRecord::recData to get mic and speaker data mixed + * Recording now in audiortp::run() method + * Audio recording working in AudioRTP: receiveSessionForSpeaker + * Open/close a wave file when pulse audio stream start/stop + + [ Emmanuel Milou ] + * Fix path for GTK+ icons; clean up + + -- Emmanuel Milou Thu, 05 Feb 2009 18:27:53 -0500 + sflphone (0.9.2-2ubuntu8) hardy; urgency=low [ Emmanuel Milou ] @@ -100,7 +141,7 @@ sflphone (0.9.2-2ubuntu6) hardy; urgency=low -- Emmanuel Milou Fri, 16 Jan 2009 18:19:05 -0500 -sflphone (0.9.2-2ubuntu5) intrepid; urgency=low +sflphone (0.9.2-2ubuntu5) hardy; urgency=low * Fix memory leak in the pulseaudio callback * Update debian package generation script @@ -116,7 +157,7 @@ sflphone (0.9.2-2ubuntu5) intrepid; urgency=low -- Emmanuel Milou Wed, 14 Jan 2009 21:17:20 -0500 -sflphone (0.9.2-2ubuntu4) intrepid; urgency=low +sflphone (0.9.2-2ubuntu4) hardy; urgency=low [ Emmanuel Milou ] * add german translation @@ -126,7 +167,7 @@ sflphone (0.9.2-2ubuntu4) intrepid; urgency=low -- Yun Liu Thu, 08 Jan 2009 13:08:51 -0500 -sflphone (0.9.2-2ubuntu3) intrepid; urgency=low +sflphone (0.9.2-2ubuntu3) hardy; urgency=low [ Emmanuel Milou ] * The main thread synchronizes the ringtone thread @@ -138,13 +179,13 @@ sflphone (0.9.2-2ubuntu3) intrepid; urgency=low -- Yun Liu Tue, 06 Jan 2009 16:18:38 -0500 -sflphone (0.9.2-2ubuntu2) intrepid; urgency=low +sflphone (0.9.2-2ubuntu2) hardy; urgency=low * Fix bug ticket #129 -- Yun Liu Wed, 5 Jan 2009 15:54:53 -0500 -sflphone (0.9.2-2ubuntu1) intrepid; urgency=low +sflphone (0.9.2-2ubuntu1) hardy; urgency=low * Migrate from eXosip library to pjsip * Add multiple SIP accounts support diff --git a/debian/changelog.intrepid b/debian/changelog.intrepid index 198965bd09d1dc4d7b1a80f2989ef4d782ba0046..07720471d4796a869cbd99823765b5404a6e8474 100644 --- a/debian/changelog.intrepid +++ b/debian/changelog.intrepid @@ -1,3 +1,44 @@ +sflphone (0.9.3-0ubuntu1) intrepid; urgency=low + + * Remove debug + * Join thread before leaving + * Fix implicit declaration in reqaccount + * Add REST code to build the request to server + * Fix GValue initialization warnings + * Update version number, fix implicit declaration, fix GTK markup + warnings + * Apply patch to create custom SIP account from our own server + + -- Emmanuel Milou Fri, 06 Feb 2009 19:17:32 -0500 + +sflphone (0.9.2-2ubuntu9) intrepid; urgency=low + + [ Alexandre Savard ] + * Speex audio codec preprocessing initialization + * peer hung up segmentation fault solved + * Stop recording when transfering + * Terminate only one call + * Add isRecording() function + * Fix call_icon GTK client + * Fix SIPCallClose() function, recorded file now close properly + * Function terminateSIPCall added in sipvoiplink and managerimpl + * Fix thread destructor + * setRecordingOption function implement in audiorecord + * Record now implemented in Call class + * Record interface complete (on hold erase previous recording) + * Added recButton in client + * Added: record button related icons + * Record button added + * Overload AudioRecord::recData to get mic and speaker data mixed + * Recording now in audiortp::run() method + * Audio recording working in AudioRTP: receiveSessionForSpeaker + * Open/close a wave file when pulse audio stream start/stop + + [ Emmanuel Milou ] + * Fix path for GTK+ icons; clean up + + -- Emmanuel Milou Thu, 05 Feb 2009 18:27:53 -0500 + sflphone (0.9.2-2ubuntu8) intrepid; urgency=low [ Emmanuel Milou ] diff --git a/debian/changelog.jaunty b/debian/changelog.jaunty index 724c06d0d34637456751d6169626b6bb4d38dc9a..2cf73d7ff811c684bb4b8e3a7fb7dd9b2ce66f01 100644 --- a/debian/changelog.jaunty +++ b/debian/changelog.jaunty @@ -1,3 +1,44 @@ +sflphone (0.9.3-0ubuntu1) jaunty; urgency=low + + * Remove debug + * Join thread before leaving + * Fix implicit declaration in reqaccount + * Add REST code to build the request to server + * Fix GValue initialization warnings + * Update version number, fix implicit declaration, fix GTK markup + warnings + * Apply patch to create custom SIP account from our own server + + -- Emmanuel Milou Fri, 06 Feb 2009 19:17:32 -0500 + +sflphone (0.9.2-2ubuntu9) jaunty; urgency=low + + [ Alexandre Savard ] + * Speex audio codec preprocessing initialization + * peer hung up segmentation fault solved + * Stop recording when transfering + * Terminate only one call + * Add isRecording() function + * Fix call_icon GTK client + * Fix SIPCallClose() function, recorded file now close properly + * Function terminateSIPCall added in sipvoiplink and managerimpl + * Fix thread destructor + * setRecordingOption function implement in audiorecord + * Record now implemented in Call class + * Record interface complete (on hold erase previous recording) + * Added recButton in client + * Added: record button related icons + * Record button added + * Overload AudioRecord::recData to get mic and speaker data mixed + * Recording now in audiortp::run() method + * Audio recording working in AudioRTP: receiveSessionForSpeaker + * Open/close a wave file when pulse audio stream start/stop + + [ Emmanuel Milou ] + * Fix path for GTK+ icons; clean up + + -- Emmanuel Milou Thu, 05 Feb 2009 18:27:53 -0500 + sflphone (0.9.2-2ubuntu8) jaunty; urgency=low [ Emmanuel Milou ] @@ -100,7 +141,7 @@ sflphone (0.9.2-2ubuntu6) jaunty; urgency=low -- Emmanuel Milou Fri, 16 Jan 2009 18:19:05 -0500 -sflphone (0.9.2-2ubuntu5) intrepid; urgency=low +sflphone (0.9.2-2ubuntu5) jaunty; urgency=low * Fix memory leak in the pulseaudio callback * Update debian package generation script @@ -116,7 +157,7 @@ sflphone (0.9.2-2ubuntu5) intrepid; urgency=low -- Emmanuel Milou Wed, 14 Jan 2009 21:17:20 -0500 -sflphone (0.9.2-2ubuntu4) intrepid; urgency=low +sflphone (0.9.2-2ubuntu4) jaunty; urgency=low [ Emmanuel Milou ] * add german translation @@ -126,7 +167,7 @@ sflphone (0.9.2-2ubuntu4) intrepid; urgency=low -- Yun Liu Thu, 08 Jan 2009 13:08:51 -0500 -sflphone (0.9.2-2ubuntu3) intrepid; urgency=low +sflphone (0.9.2-2ubuntu3) jaunty; urgency=low [ Emmanuel Milou ] * The main thread synchronizes the ringtone thread @@ -138,13 +179,13 @@ sflphone (0.9.2-2ubuntu3) intrepid; urgency=low -- Yun Liu Tue, 06 Jan 2009 16:18:38 -0500 -sflphone (0.9.2-2ubuntu2) intrepid; urgency=low +sflphone (0.9.2-2ubuntu2) jaunty; urgency=low * Fix bug ticket #129 -- Yun Liu Wed, 5 Jan 2009 15:54:53 -0500 -sflphone (0.9.2-2ubuntu1) intrepid; urgency=low +sflphone (0.9.2-2ubuntu1) jaunty; urgency=low * Migrate from eXosip library to pjsip * Add multiple SIP accounts support diff --git a/debian/control.hardy b/debian/control.hardy index f90c5d57c9b6137a9d8fe5cb308892c978091c04..6721579fefa9ef3d7e33ffea7352872a802d1383 100644 --- a/debian/control.hardy +++ b/debian/control.hardy @@ -2,7 +2,7 @@ Source: sflphone Maintainer: SavoirFaireLinux Inc Section: gnome Priority: optional -Build-Depends: debhelper (>= 5) +Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev Standards-Version: 3.7.3 Package: sflphone diff --git a/debian/control.intrepid b/debian/control.intrepid index 45e00af203e28dd5e19ad962dc2dad4f23e9acd6..187b3f21a20ebcde41488ffa976c1e5ad656028d 100644 --- a/debian/control.intrepid +++ b/debian/control.intrepid @@ -2,7 +2,7 @@ Source: sflphone Maintainer: SavoirFaireLinux Inc Section: gnome Priority: optional -Build-Depends: debhelper (>= 5) +Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev Standards-Version: 3.8.0 Package: sflphone diff --git a/debian/control.jaunty b/debian/control.jaunty index 1349a8dfb8bea5112435a2a13ffe63b3674ca7b6..27b37eb91f3923f1fdf47d4cf38367cf30429fee 100644 --- a/debian/control.jaunty +++ b/debian/control.jaunty @@ -2,7 +2,7 @@ Source: sflphone Maintainer: SavoirFaireLinux Inc Section: gnome Priority: optional -Build-Depends: debhelper (>= 5) +Build-Depends: debhelper (>= 5), autoconf, automake, libpulse-dev, libsamplerate0-dev, libcommoncpp2-dev, libccrtp-dev, dbus-c++-1-dev, libcppunit-dev, libgsm1-dev, libspeex-dev, sflphone-iax2-dev, libtool, libgtk2.0-dev, libsexy-dev, libdbus-1-dev, libdbus-glib-1-dev, libnotify-dev Standards-Version: 3.7.3 Package: sflphone diff --git a/libs/pjproject-1.0/COPYING b/libs/pjproject-1.0.1/COPYING similarity index 100% rename from libs/pjproject-1.0/COPYING rename to libs/pjproject-1.0.1/COPYING diff --git a/libs/pjproject-1.0/INSTALL.txt b/libs/pjproject-1.0.1/INSTALL.txt similarity index 100% rename from libs/pjproject-1.0/INSTALL.txt rename to libs/pjproject-1.0.1/INSTALL.txt diff --git a/libs/pjproject-1.0/README-RTEMS b/libs/pjproject-1.0.1/README-RTEMS similarity index 100% rename from libs/pjproject-1.0/README-RTEMS rename to libs/pjproject-1.0.1/README-RTEMS diff --git a/libs/pjproject-1.0/README.txt b/libs/pjproject-1.0.1/README.txt similarity index 100% rename from libs/pjproject-1.0/README.txt rename to libs/pjproject-1.0.1/README.txt diff --git a/libs/pjproject-1.0/aconfigure b/libs/pjproject-1.0.1/aconfigure similarity index 100% rename from libs/pjproject-1.0/aconfigure rename to libs/pjproject-1.0.1/aconfigure diff --git a/libs/pjproject-1.0/aconfigure.ac b/libs/pjproject-1.0.1/aconfigure.ac similarity index 100% rename from libs/pjproject-1.0/aconfigure.ac rename to libs/pjproject-1.0.1/aconfigure.ac diff --git a/libs/pjproject-1.0.1/build.mak b/libs/pjproject-1.0.1/build.mak new file mode 100644 index 0000000000000000000000000000000000000000..e92179c90f2cdd48867003f3156c3842816cb740 --- /dev/null +++ b/libs/pjproject-1.0.1/build.mak @@ -0,0 +1,86 @@ +# build.mak. Generated from build.mak.in by configure. +export MACHINE_NAME := auto +export OS_NAME := auto +export HOST_NAME := unix +export CC_NAME := gcc +export TARGET_NAME := i686-pc-linux-gnu +export CROSS_COMPILE := +export LINUX_POLL := select + +LIB_SUFFIX = $(TARGET_NAME).a + +# Determine which party libraries to use +export APP_THIRD_PARTY_LIBS := -lresample-$(TARGET_NAME) -lmilenage-$(TARGET_NAME) -lsrtp-$(TARGET_NAME) +export APP_THIRD_PARTY_LIB_FILES = $(PJ_DIR)/third_party/lib/libresample-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libmilenage-$(LIB_SUFFIX) $(PJ_DIR)/third_party/lib/libsrtp-$(LIB_SUFFIX) + +ifneq (,1) +APP_THIRD_PARTY_LIBS += -lgsmcodec-$(TARGET_NAME) +APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libgsmcodec-$(LIB_SUFFIX) +endif + +ifneq (,1) +APP_THIRD_PARTY_LIBS += -lspeex-$(TARGET_NAME) +APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libspeex-$(LIB_SUFFIX) +endif + +ifneq (,1) +APP_THIRD_PARTY_LIBS += -lilbccodec-$(TARGET_NAME) +APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libilbccodec-$(LIB_SUFFIX) +endif + +ifneq ($(findstring pa,pa_unix),) +APP_THIRD_PARTY_LIBS += -lportaudio-$(TARGET_NAME) +APP_THIRD_PARTY_LIB_FILES += $(PJ_DIR)/third_party/lib/libportaudio-$(LIB_SUFFIX) +endif + +# Additional flags + + +# CFLAGS, LDFLAGS, and LIBS to be used by applications +export PJDIR := /home-local/manu/dev/sfl/SFLphone/sflphone/libs/pjproject-1.0.1 +export APP_CC := $(CROSS_COMPILE)$(CC_NAME) +export APP_CFLAGS := -DPJ_AUTOCONF=1\ + -O2\ + -I$(PJDIR)/pjlib/include\ + -I$(PJDIR)/pjlib-util/include\ + -I$(PJDIR)/pjnath/include\ + -I$(PJDIR)/pjmedia/include\ + -I$(PJDIR)/pjsip/include +export APP_CXXFLAGS := $(APP_CFLAGS) +export APP_LDFLAGS := -L$(PJDIR)/pjlib/lib\ + -L$(PJDIR)/pjlib-util/lib\ + -L$(PJDIR)/pjnath/lib\ + -L$(PJDIR)/pjmedia/lib\ + -L$(PJDIR)/pjsip/lib\ + -L$(PJDIR)/third_party/lib\ + +export APP_LDLIBS := -lpjsua-sfl-$(TARGET_NAME)\ + -lpjsip-ua-sfl-$(TARGET_NAME)\ + -lpjsip-simple-sfl-$(TARGET_NAME)\ + -lpjsip-sfl-$(TARGET_NAME)\ + -lpjmedia-codec-sfl-$(TARGET_NAME)\ + -lpjmedia-sfl-$(TARGET_NAME)\ + -lpjnath-sfl-$(TARGET_NAME)\ + -lpjlib-util-sfl-$(TARGET_NAME)\ + $(APP_THIRD_PARTY_LIBS)\ + -lpj-sfl-$(TARGET_NAME)\ + -lm -lnsl -lrt -lpthread -lasound +export APP_LIB_FILES = $(PJ_DIR)/pjsip/lib/libpjsua-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjsip/lib/libpjsip-ua-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjsip/lib/libpjsip-simple-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjsip/lib/libpjsip-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjmedia/lib/libpjmedia-codec-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjmedia/lib/libpjmedia-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjnath/lib/libpjnath-sfl-$(LIB_SUFFIX) \ + $(PJ_DIR)/pjlib-util/lib/libpjlib-util-sfl-$(LIB_SUFFIX) \ + $(APP_THIRD_PARTY_LIB_FILES) \ + $(PJ_DIR)/pjlib/lib/libpj-sfl-$(LIB_SUFFIX) + +export PJ_DIR := $(PJDIR) +export PJ_CC := $(APP_CC) +export PJ_CFLAGS := $(APP_CFLAGS) +export PJ_CXXFLAGS := $(APP_CXXFLAGS) +export PJ_LDFLAGS := $(APP_LDFLAGS) +export PJ_LDLIBS := $(APP_LDLIBS) +export PJ_LIB_FILES := $(APP_LIB_FILES) + diff --git a/libs/pjproject-1.0/build.mak.in b/libs/pjproject-1.0.1/build.mak.in similarity index 100% rename from libs/pjproject-1.0/build.mak.in rename to libs/pjproject-1.0.1/build.mak.in diff --git a/libs/pjproject-1.0/build.symbian/00.bat b/libs/pjproject-1.0.1/build.symbian/00.bat similarity index 100% rename from libs/pjproject-1.0/build.symbian/00.bat rename to libs/pjproject-1.0.1/build.symbian/00.bat diff --git a/libs/pjproject-1.0/build.symbian/01.bat b/libs/pjproject-1.0.1/build.symbian/01.bat similarity index 100% rename from libs/pjproject-1.0/build.symbian/01.bat rename to libs/pjproject-1.0.1/build.symbian/01.bat diff --git a/libs/pjproject-1.0/build.symbian/bld.inf b/libs/pjproject-1.0.1/build.symbian/bld.inf similarity index 100% rename from libs/pjproject-1.0/build.symbian/bld.inf rename to libs/pjproject-1.0.1/build.symbian/bld.inf diff --git a/libs/pjproject-1.0/build.symbian/libgsmcodec.mmp b/libs/pjproject-1.0.1/build.symbian/libgsmcodec.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/libgsmcodec.mmp rename to libs/pjproject-1.0.1/build.symbian/libgsmcodec.mmp diff --git a/libs/pjproject-1.0/build.symbian/libspeexcodec.mmp b/libs/pjproject-1.0.1/build.symbian/libspeexcodec.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/libspeexcodec.mmp rename to libs/pjproject-1.0.1/build.symbian/libspeexcodec.mmp diff --git a/libs/pjproject-1.0/build.symbian/libsrtp.mmp b/libs/pjproject-1.0.1/build.symbian/libsrtp.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/libsrtp.mmp rename to libs/pjproject-1.0.1/build.symbian/libsrtp.mmp diff --git a/libs/pjproject-1.0/build.symbian/makedef.sh b/libs/pjproject-1.0.1/build.symbian/makedef.sh similarity index 100% rename from libs/pjproject-1.0/build.symbian/makedef.sh rename to libs/pjproject-1.0.1/build.symbian/makedef.sh diff --git a/libs/pjproject-1.0/build.symbian/null_audio.mmp b/libs/pjproject-1.0.1/build.symbian/null_audio.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/null_audio.mmp rename to libs/pjproject-1.0.1/build.symbian/null_audio.mmp diff --git a/libs/pjproject-1.0/build.symbian/null_audioU.def b/libs/pjproject-1.0.1/build.symbian/null_audioU.def similarity index 100% rename from libs/pjproject-1.0/build.symbian/null_audioU.def rename to libs/pjproject-1.0.1/build.symbian/null_audioU.def diff --git a/libs/pjproject-1.0/build.symbian/pjlib.mmp b/libs/pjproject-1.0.1/build.symbian/pjlib.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjlib.mmp rename to libs/pjproject-1.0.1/build.symbian/pjlib.mmp diff --git a/libs/pjproject-1.0/build.symbian/pjlibU.def b/libs/pjproject-1.0.1/build.symbian/pjlibU.def similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjlibU.def rename to libs/pjproject-1.0.1/build.symbian/pjlibU.def diff --git a/libs/pjproject-1.0/build.symbian/pjlib_test.mmp b/libs/pjproject-1.0.1/build.symbian/pjlib_test.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjlib_test.mmp rename to libs/pjproject-1.0.1/build.symbian/pjlib_test.mmp diff --git a/libs/pjproject-1.0/build.symbian/pjlib_util.mmp b/libs/pjproject-1.0.1/build.symbian/pjlib_util.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjlib_util.mmp rename to libs/pjproject-1.0.1/build.symbian/pjlib_util.mmp diff --git a/libs/pjproject-1.0/build.symbian/pjlib_utilU.def b/libs/pjproject-1.0.1/build.symbian/pjlib_utilU.def similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjlib_utilU.def rename to libs/pjproject-1.0.1/build.symbian/pjlib_utilU.def diff --git a/libs/pjproject-1.0/build.symbian/pjmedia.mmp b/libs/pjproject-1.0.1/build.symbian/pjmedia.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjmedia.mmp rename to libs/pjproject-1.0.1/build.symbian/pjmedia.mmp diff --git a/libs/pjproject-1.0/build.symbian/pjmediaU.def b/libs/pjproject-1.0.1/build.symbian/pjmediaU.def similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjmediaU.def rename to libs/pjproject-1.0.1/build.symbian/pjmediaU.def diff --git a/libs/pjproject-1.0/build.symbian/pjnath.mmp b/libs/pjproject-1.0.1/build.symbian/pjnath.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjnath.mmp rename to libs/pjproject-1.0.1/build.symbian/pjnath.mmp diff --git a/libs/pjproject-1.0/build.symbian/pjnathU.def b/libs/pjproject-1.0.1/build.symbian/pjnathU.def similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjnathU.def rename to libs/pjproject-1.0.1/build.symbian/pjnathU.def diff --git a/libs/pjproject-1.0/build.symbian/pjproject.cww b/libs/pjproject-1.0.1/build.symbian/pjproject.cww similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjproject.cww rename to libs/pjproject-1.0.1/build.symbian/pjproject.cww diff --git a/libs/pjproject-1.0/build.symbian/pjsdp.mmp b/libs/pjproject-1.0.1/build.symbian/pjsdp.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjsdp.mmp rename to libs/pjproject-1.0.1/build.symbian/pjsdp.mmp diff --git a/libs/pjproject-1.0/build.symbian/pjsdpU.def b/libs/pjproject-1.0.1/build.symbian/pjsdpU.def similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjsdpU.def rename to libs/pjproject-1.0.1/build.symbian/pjsdpU.def diff --git a/libs/pjproject-1.0/build.symbian/pjsip.mmp b/libs/pjproject-1.0.1/build.symbian/pjsip.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjsip.mmp rename to libs/pjproject-1.0.1/build.symbian/pjsip.mmp diff --git a/libs/pjproject-1.0/build.symbian/pjsipU.def b/libs/pjproject-1.0.1/build.symbian/pjsipU.def similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjsipU.def rename to libs/pjproject-1.0.1/build.symbian/pjsipU.def diff --git a/libs/pjproject-1.0/build.symbian/pjsip_simple.mmp b/libs/pjproject-1.0.1/build.symbian/pjsip_simple.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjsip_simple.mmp rename to libs/pjproject-1.0.1/build.symbian/pjsip_simple.mmp diff --git a/libs/pjproject-1.0/build.symbian/pjsip_simpleU.def b/libs/pjproject-1.0.1/build.symbian/pjsip_simpleU.def similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjsip_simpleU.def rename to libs/pjproject-1.0.1/build.symbian/pjsip_simpleU.def diff --git a/libs/pjproject-1.0/build.symbian/pjsip_ua.mmp b/libs/pjproject-1.0.1/build.symbian/pjsip_ua.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjsip_ua.mmp rename to libs/pjproject-1.0.1/build.symbian/pjsip_ua.mmp diff --git a/libs/pjproject-1.0/build.symbian/pjsip_uaU.def b/libs/pjproject-1.0.1/build.symbian/pjsip_uaU.def similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjsip_uaU.def rename to libs/pjproject-1.0.1/build.symbian/pjsip_uaU.def diff --git a/libs/pjproject-1.0/build.symbian/pjstun_client.mmp b/libs/pjproject-1.0.1/build.symbian/pjstun_client.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjstun_client.mmp rename to libs/pjproject-1.0.1/build.symbian/pjstun_client.mmp diff --git a/libs/pjproject-1.0/build.symbian/pjsua_lib.mmp b/libs/pjproject-1.0.1/build.symbian/pjsua_lib.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjsua_lib.mmp rename to libs/pjproject-1.0.1/build.symbian/pjsua_lib.mmp diff --git a/libs/pjproject-1.0/build.symbian/pjsua_libU.def b/libs/pjproject-1.0.1/build.symbian/pjsua_libU.def similarity index 100% rename from libs/pjproject-1.0/build.symbian/pjsua_libU.def rename to libs/pjproject-1.0.1/build.symbian/pjsua_libU.def diff --git a/libs/pjproject-1.0/build.symbian/symbian_audio.mmp b/libs/pjproject-1.0.1/build.symbian/symbian_audio.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/symbian_audio.mmp rename to libs/pjproject-1.0.1/build.symbian/symbian_audio.mmp diff --git a/libs/pjproject-1.0/build.symbian/symbian_audioU.def b/libs/pjproject-1.0.1/build.symbian/symbian_audioU.def similarity index 100% rename from libs/pjproject-1.0/build.symbian/symbian_audioU.def rename to libs/pjproject-1.0.1/build.symbian/symbian_audioU.def diff --git a/libs/pjproject-1.0/build.symbian/symbian_audio_aps.mmp b/libs/pjproject-1.0.1/build.symbian/symbian_audio_aps.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/symbian_audio_aps.mmp rename to libs/pjproject-1.0.1/build.symbian/symbian_audio_aps.mmp diff --git a/libs/pjproject-1.0/build.symbian/symbian_ua.mmp b/libs/pjproject-1.0.1/build.symbian/symbian_ua.mmp similarity index 94% rename from libs/pjproject-1.0/build.symbian/symbian_ua.mmp rename to libs/pjproject-1.0.1/build.symbian/symbian_ua.mmp index b6648524b2a1e2a8e0ce7f467b3a98bf85bcc764..938b84d4fe9177b7a718bf8ee433b3b77209cc3a 100644 --- a/libs/pjproject-1.0/build.symbian/symbian_ua.mmp +++ b/libs/pjproject-1.0.1/build.symbian/symbian_ua.mmp @@ -55,7 +55,7 @@ STATICLIBRARY libgsmcodec.lib libspeexcodec.lib STATICLIBRARY eexe.lib ecrt0.lib #endif -LIBRARY esock.lib insock.lib charconv.lib euser.lib estlib.lib +LIBRARY esock.lib insock.lib charconv.lib euser.lib estlib.lib commdb.lib apengine.lib // The default 8KB seems to be insufficient with all bells and // whistles turned on diff --git a/libs/pjproject-1.0/build.symbian/symbian_ua_udeb.pkg b/libs/pjproject-1.0.1/build.symbian/symbian_ua_udeb.pkg similarity index 100% rename from libs/pjproject-1.0/build.symbian/symbian_ua_udeb.pkg rename to libs/pjproject-1.0.1/build.symbian/symbian_ua_udeb.pkg diff --git a/libs/pjproject-1.0/build.symbian/symbian_ua_urel.pkg b/libs/pjproject-1.0.1/build.symbian/symbian_ua_urel.pkg similarity index 100% rename from libs/pjproject-1.0/build.symbian/symbian_ua_urel.pkg rename to libs/pjproject-1.0.1/build.symbian/symbian_ua_urel.pkg diff --git a/libs/pjproject-1.0/build.symbian/symsndtest.mmp b/libs/pjproject-1.0.1/build.symbian/symsndtest.mmp similarity index 100% rename from libs/pjproject-1.0/build.symbian/symsndtest.mmp rename to libs/pjproject-1.0.1/build.symbian/symsndtest.mmp diff --git a/libs/pjproject-1.0/build.symbian/symsndtest.pkg b/libs/pjproject-1.0.1/build.symbian/symsndtest.pkg similarity index 100% rename from libs/pjproject-1.0/build.symbian/symsndtest.pkg rename to libs/pjproject-1.0.1/build.symbian/symsndtest.pkg diff --git a/libs/pjproject-1.0/build/cc-gcc.mak b/libs/pjproject-1.0.1/build/cc-gcc.mak similarity index 100% rename from libs/pjproject-1.0/build/cc-gcc.mak rename to libs/pjproject-1.0.1/build/cc-gcc.mak diff --git a/libs/pjproject-1.0/build/cc-vc.mak b/libs/pjproject-1.0.1/build/cc-vc.mak similarity index 100% rename from libs/pjproject-1.0/build/cc-vc.mak rename to libs/pjproject-1.0.1/build/cc-vc.mak diff --git a/libs/pjproject-1.0/build/common.mak b/libs/pjproject-1.0.1/build/common.mak similarity index 100% rename from libs/pjproject-1.0/build/common.mak rename to libs/pjproject-1.0.1/build/common.mak diff --git a/libs/pjproject-1.0/build/host-mingw.mak b/libs/pjproject-1.0.1/build/host-mingw.mak similarity index 100% rename from libs/pjproject-1.0/build/host-mingw.mak rename to libs/pjproject-1.0.1/build/host-mingw.mak diff --git a/libs/pjproject-1.0/build/host-unix.mak b/libs/pjproject-1.0.1/build/host-unix.mak similarity index 100% rename from libs/pjproject-1.0/build/host-unix.mak rename to libs/pjproject-1.0.1/build/host-unix.mak diff --git a/libs/pjproject-1.0/build/host-win32.mak b/libs/pjproject-1.0.1/build/host-win32.mak similarity index 100% rename from libs/pjproject-1.0/build/host-win32.mak rename to libs/pjproject-1.0.1/build/host-win32.mak diff --git a/libs/pjproject-1.0/build/m-alpha.mak b/libs/pjproject-1.0.1/build/m-alpha.mak similarity index 100% rename from libs/pjproject-1.0/build/m-alpha.mak rename to libs/pjproject-1.0.1/build/m-alpha.mak diff --git a/libs/pjproject-1.0/build/m-arm.mak b/libs/pjproject-1.0.1/build/m-arm.mak similarity index 100% rename from libs/pjproject-1.0/build/m-arm.mak rename to libs/pjproject-1.0.1/build/m-arm.mak diff --git a/libs/pjproject-1.0/build/m-auto.mak b/libs/pjproject-1.0.1/build/m-auto.mak similarity index 100% rename from libs/pjproject-1.0/build/m-auto.mak rename to libs/pjproject-1.0.1/build/m-auto.mak diff --git a/libs/pjproject-1.0/build/m-i386.mak b/libs/pjproject-1.0.1/build/m-i386.mak similarity index 100% rename from libs/pjproject-1.0/build/m-i386.mak rename to libs/pjproject-1.0.1/build/m-i386.mak diff --git a/libs/pjproject-1.0/build/m-m68k.mak b/libs/pjproject-1.0.1/build/m-m68k.mak similarity index 100% rename from libs/pjproject-1.0/build/m-m68k.mak rename to libs/pjproject-1.0.1/build/m-m68k.mak diff --git a/libs/pjproject-1.0/build/m-mpc860.mak b/libs/pjproject-1.0.1/build/m-mpc860.mak similarity index 100% rename from libs/pjproject-1.0/build/m-mpc860.mak rename to libs/pjproject-1.0.1/build/m-mpc860.mak diff --git a/libs/pjproject-1.0/build/m-powerpc.mak b/libs/pjproject-1.0.1/build/m-powerpc.mak similarity index 100% rename from libs/pjproject-1.0/build/m-powerpc.mak rename to libs/pjproject-1.0.1/build/m-powerpc.mak diff --git a/libs/pjproject-1.0/build/m-sparc.mak b/libs/pjproject-1.0.1/build/m-sparc.mak similarity index 100% rename from libs/pjproject-1.0/build/m-sparc.mak rename to libs/pjproject-1.0.1/build/m-sparc.mak diff --git a/libs/pjproject-1.0/build/m-x86_64.mak b/libs/pjproject-1.0.1/build/m-x86_64.mak similarity index 100% rename from libs/pjproject-1.0/build/m-x86_64.mak rename to libs/pjproject-1.0.1/build/m-x86_64.mak diff --git a/libs/pjproject-1.0.1/build/os-auto.mak b/libs/pjproject-1.0.1/build/os-auto.mak new file mode 100644 index 0000000000000000000000000000000000000000..be0a835541d3df85bdbc8084bd0fe96562c062af --- /dev/null +++ b/libs/pjproject-1.0.1/build/os-auto.mak @@ -0,0 +1,11 @@ +# build/os-auto.mak. Generated from os-auto.mak.in by configure. + +export OS_CFLAGS := $(CC_DEF)PJ_AUTOCONF=1 -O2 + +export OS_CXXFLAGS := $(CC_DEF)PJ_AUTOCONF=1 -O2 + +export OS_LDFLAGS := -lm -lnsl -lrt -lpthread -lasound + +export OS_SOURCES := + + diff --git a/libs/pjproject-1.0/build/os-auto.mak.in b/libs/pjproject-1.0.1/build/os-auto.mak.in similarity index 100% rename from libs/pjproject-1.0/build/os-auto.mak.in rename to libs/pjproject-1.0.1/build/os-auto.mak.in diff --git a/libs/pjproject-1.0/build/os-darwinos.mak b/libs/pjproject-1.0.1/build/os-darwinos.mak similarity index 100% rename from libs/pjproject-1.0/build/os-darwinos.mak rename to libs/pjproject-1.0.1/build/os-darwinos.mak diff --git a/libs/pjproject-1.0/build/os-linux-kernel.mak b/libs/pjproject-1.0.1/build/os-linux-kernel.mak similarity index 100% rename from libs/pjproject-1.0/build/os-linux-kernel.mak rename to libs/pjproject-1.0.1/build/os-linux-kernel.mak diff --git a/libs/pjproject-1.0/build/os-linux.mak b/libs/pjproject-1.0.1/build/os-linux.mak similarity index 100% rename from libs/pjproject-1.0/build/os-linux.mak rename to libs/pjproject-1.0.1/build/os-linux.mak diff --git a/libs/pjproject-1.0/build/os-palmos.mak b/libs/pjproject-1.0.1/build/os-palmos.mak similarity index 100% rename from libs/pjproject-1.0/build/os-palmos.mak rename to libs/pjproject-1.0.1/build/os-palmos.mak diff --git a/libs/pjproject-1.0/build/os-rtems.mak b/libs/pjproject-1.0.1/build/os-rtems.mak similarity index 100% rename from libs/pjproject-1.0/build/os-rtems.mak rename to libs/pjproject-1.0.1/build/os-rtems.mak diff --git a/libs/pjproject-1.0/build/os-sunos.mak b/libs/pjproject-1.0.1/build/os-sunos.mak similarity index 100% rename from libs/pjproject-1.0/build/os-sunos.mak rename to libs/pjproject-1.0.1/build/os-sunos.mak diff --git a/libs/pjproject-1.0/build/os-win32.mak b/libs/pjproject-1.0.1/build/os-win32.mak similarity index 100% rename from libs/pjproject-1.0/build/os-win32.mak rename to libs/pjproject-1.0.1/build/os-win32.mak diff --git a/libs/pjproject-1.0/build/rules.mak b/libs/pjproject-1.0.1/build/rules.mak similarity index 99% rename from libs/pjproject-1.0/build/rules.mak rename to libs/pjproject-1.0.1/build/rules.mak index 9ee3fba5f5ae080ac139534b843344ff52274a17..bbe0ab1942efd6cf93e7388ff13e9fea19c901c0 100644 --- a/libs/pjproject-1.0/build/rules.mak +++ b/libs/pjproject-1.0.1/build/rules.mak @@ -80,7 +80,7 @@ $(LIB): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) $(RANLIB) $(LIB) $(EXE): $(OBJDIRS) $(OBJS) $($(APP)_EXTRA_DEP) - if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi + if test ! -d $(BINDIR); then $(subst @@,$(subst /,$(HOST_PSEP),$(BINDIR)),$(HOST_MKDIR)); fi $(LD) $(LDOUT)$(subst /,$(HOST_PSEP),$(EXE)) \ $(subst /,$(HOST_PSEP),$(OBJS)) $($(APP)_LDFLAGS) diff --git a/libs/pjproject-1.0/c++-build.mak b/libs/pjproject-1.0.1/c++-build.mak similarity index 100% rename from libs/pjproject-1.0/c++-build.mak rename to libs/pjproject-1.0.1/c++-build.mak diff --git a/libs/pjproject-1.0/third_party/portaudio/config.guess b/libs/pjproject-1.0.1/config.guess similarity index 66% rename from libs/pjproject-1.0/third_party/portaudio/config.guess rename to libs/pjproject-1.0.1/config.guess index 278f9e9e07c1d1a3bda668e6529bcce3006cfbdf..dff9e481b70f9505b49ce999629a168a19976f4f 100755 --- a/libs/pjproject-1.0/third_party/portaudio/config.guess +++ b/libs/pjproject-1.0.1/config.guess @@ -1,10 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, -# Inc. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. -timestamp='2007-07-22' +timestamp='2001-09-04' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -18,18 +17,15 @@ timestamp='2007-07-22' # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. - -# Originally written by Per Bothner . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. +# Written by Per Bothner . +# Please send patches to . # # This script attempts to guess a canonical system name similar to # config.sub. If it succeeds, it prints the system name on stdout, and @@ -56,7 +52,7 @@ version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO @@ -69,11 +65,11 @@ Try \`$me --help' for more information." while test $# -gt 0 ; do case $1 in --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; + echo "$timestamp" ; exit 0 ;; --version | -v ) - echo "$version" ; exit ;; + echo "$version" ; exit 0 ;; --help | --h* | -h ) - echo "$usage"; exit ;; + echo "$usage"; exit 0 ;; -- ) # Stop option processing shift; break ;; - ) # Use stdin as input. @@ -91,42 +87,30 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' 1 2 15 -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. +dummy=dummy-$$ +trap 'rm -f $dummy.c $dummy.o $dummy.rel $dummy; exit 1' 1 2 15 +# CC_FOR_BUILD -- compiler used by this script. # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then +set_cc_for_build='case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int dummy(){}" > $dummy.c ; + for c in cc gcc c89 ; do + ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 ; + if test $? = 0 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; + rm -f $dummy.c $dummy.o $dummy.rel ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' +esac' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -143,31 +127,29 @@ UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or + # Netbsd (nbsd) targets should (where applicable) match one or # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; + # Determine the machine/vendor (is the vendor relevant). + case "${UNAME_MACHINE}" in + amiga) machine=m68k-unknown ;; + arm32) machine=arm-unknown ;; + atari*) machine=m68k-atari ;; + sun3*) machine=m68k-sun ;; + mac68k) machine=m68k-apple ;; + macppc) machine=powerpc-apple ;; + hp3[0-9][05]) machine=m68k-hp ;; + ibmrt|romp-ibm) machine=romp-ibm ;; + *) machine=${UNAME_MACHINE}-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) + case "${UNAME_MACHINE}" in + i386|sparc|amiga|arm*|hp300|mvme68k|vax|atari|luna68k|mac68k|news68k|next68k|pc532|sun3*|x68k) eval $set_cc_for_build if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep __ELF__ >/dev/null @@ -184,128 +166,120 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in ;; esac # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; + exit 0 ;; alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) + if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. + fi # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + cat <$dummy.s + .data +\$Lformat: + .byte 37,100,45,37,120,10,0 # "%d-%x\n" + + .text + .globl main + .align 4 + .ent main +main: + .frame \$30,16,\$26,0 + ldgp \$29,0(\$27) + .prologue 1 + .long 0x47e03d80 # implver \$0 + lda \$2,-1 + .long 0x47e20c21 # amask \$2,\$1 + lda \$16,\$Lformat + mov \$0,\$17 + not \$1,\$18 + jsr \$26,printf + ldgp \$29,0(\$26) + mov 0,\$16 + jsr \$26,exit + .end main +EOF + eval $set_cc_for_build + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null + if test "$?" = 0 ; then + case `./$dummy` in + 0-0) + UNAME_MACHINE="alpha" + ;; + 1-0) + UNAME_MACHINE="alphaev5" + ;; + 1-1) + UNAME_MACHINE="alphaev56" + ;; + 1-101) + UNAME_MACHINE="alphapca56" + ;; + 2-303) + UNAME_MACHINE="alphaev6" + ;; + 2-307) + UNAME_MACHINE="alphaev67" + ;; + 2-1307) + UNAME_MACHINE="alphaev68" + ;; + esac + fi + rm -f $dummy.s $dummy + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead # of the specific Alpha model? echo alpha-pc-interix - exit ;; + exit 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 - exit ;; + exit 0 ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 - exit ;; + exit 0;; + amiga:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:[Aa]miga[Oo][Ss]:*:*) echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; + exit 0 ;; + arc64:OpenBSD:*:*) + echo mips64el-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + arc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + hkmips:OpenBSD:*:*) + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + pmax:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + sgi:OpenBSD:*:*) + echo mips-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + wgrisc:OpenBSD:*:*) + echo mipsel-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; *:OS/390:*:*) echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; + exit 0;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp - exit ;; + exit 0;; Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. if test "`(/bin/universe) 2>/dev/null`" = att ; then @@ -313,32 +287,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in else echo pyramid-pyramid-bsd fi - exit ;; + exit 0 ;; NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; + exit 0 ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) + exit 0 ;; + i86pc:SunOS:5.*:*) echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) @@ -347,12 +314,12 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; + exit 0 ;; sun3*:SunOS:*:*) echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` + UNAME_RELEASE=`(head -1 /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) @@ -362,10 +329,16 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in echo sparc-sun-sunos${UNAME_RELEASE} ;; esac - exit ;; + exit 0 ;; aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; + exit 0 ;; + sparc*:NetBSD:*) + echo `uname -p`-unknown-netbsd${UNAME_RELEASE} + exit 0 ;; + atari*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor @@ -376,40 +349,49 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint${UNAME_RELEASE} - exit ;; + exit 0 ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; + sun3*:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mac68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme68k:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; + mvme88k:OpenBSD:*:*) + echo m88k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; + exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 - exit ;; + exit 0 ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; + exit 0 ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; + exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -433,33 +415,27 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in exit (-1); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD $dummy.c -o $dummy \ + && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} - exit ;; + exit 0 ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; + exit 0 ;; Night_Hawk:Power_UNIX:*:*) echo powerpc-harris-powerunix - exit ;; + exit 0 ;; m88k:CX/UX:7*:*) echo m88k-harris-cxux7 - exit ;; + exit 0 ;; m88k:*:4*:R4*) echo m88k-motorola-sysv4 - exit ;; + exit 0 ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` @@ -475,29 +451,29 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 - exit ;; + exit 0 ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 - exit ;; + exit 0 ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 - exit ;; + exit 0 ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd - exit ;; + exit 0 ;; *:IRIX*:*:*) echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; + exit 0 ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' + echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id + exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix - exit ;; + exit 0 ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` @@ -505,7 +481,7 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval $set_cc_for_build @@ -520,20 +496,17 @@ EOF exit(0); } EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi - exit ;; + exit 0 ;; *:AIX:*:[45]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` + IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | head -1 | awk '{ print $1 }'` if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else @@ -545,36 +518,38 @@ EOF IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} fi echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; + exit 0 ;; *:AIX:*:*) echo rs6000-ibm-aix - exit ;; + exit 0 ;; ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 - exit ;; + exit 0 ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 + exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx - exit ;; + exit 0 ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 - exit ;; + exit 0 ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd - exit ;; + exit 0 ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 - exit ;; + exit 0 ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` case "${UNAME_MACHINE}" in 9000/31? ) HP_ARCH=m68000 ;; 9000/[34]?? ) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` + case "${HPUX_REV}" in + 11.[0-9][0-9]) + if [ -x /usr/bin/getconf ]; then + sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "${sc_cpu_version}" in 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 @@ -583,13 +558,13 @@ EOF case "${sc_kernel_bits}" in 32) HP_ARCH="hppa2.0n" ;; 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 esac ;; esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c + fi ;; + esac + if [ "${HP_ARCH}" = "" ]; then + eval $set_cc_for_build + sed 's/^ //' << EOF >$dummy.c #define _HPUX_SOURCE #include @@ -622,37 +597,17 @@ EOF exit (0); } EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi + rm -f $dummy.c $dummy + fi ;; esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; ia64:HP-UX:*:*) HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux${HPUX_REV} - exit ;; + exit 0 ;; 3050*:HI-UX:*:*) eval $set_cc_for_build sed 's/^ //' << EOF >$dummy.c @@ -680,237 +635,158 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 - exit ;; + exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) echo hppa1.1-hp-bsd - exit ;; + exit 0 ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd - exit ;; + exit 0 ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix - exit ;; + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf - exit ;; + exit 0 ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf - exit ;; + exit 0 ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo ${UNAME_MACHINE}-unknown-osf1mk else echo ${UNAME_MACHINE}-unknown-osf1 fi - exit ;; + exit 0 ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites - exit ;; + exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd - exit ;; + exit 0 ;; C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) echo c34-convex-bsd - exit ;; + exit 0 ;; C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd - exit ;; + exit 0 ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd - exit ;; + exit 0 ;; + CRAY*X-MP:*:*:*) + echo xmp-cray-unicos + exit 0 ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*[A-Z]90:*:*:*) echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; + CRAY*T3D:*:*:*) + echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; + exit 0 ;; + CRAY-2:*:*:*) + echo cray2-cray-unicos + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; + exit 0 ;; + hp300:OpenBSD:*:*) + echo m68k-unknown-openbsd${UNAME_RELEASE} + exit 0 ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:BSD/OS:*:*) echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; + exit 0 ;; *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; + echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` + exit 0 ;; + *:OpenBSD:*:*) + echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + exit 0 ;; i*:CYGWIN*:*) echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) + exit 0 ;; + i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; + exit 0 ;; i*:PW*:*) echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; + exit 0 ;; i*:Windows_NT*:* | Pentium*:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; + echo i386-pc-interix + exit 0 ;; i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin - exit ;; + exit 0 ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + exit 0 ;; *:GNU:*:*) - # the GNU system echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; + exit 0 ;; i*86:Minix:*:*) echo ${UNAME_MACHINE}-pc-minix - exit ;; + exit 0 ;; arm*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; + exit 0 ;; ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + echo ${UNAME_MACHINE}-unknown-linux + exit 0 ;; m68*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } + case `sed -n '/^byte/s/^.*: \(.*\) endian/\1/p' < /proc/cpuinfo` in + big) echo mips-unknown-linux-gnu && exit 0 ;; + little) echo mipsel-unknown-linux-gnu && exit 0 ;; + esac ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-gnu - exit ;; + exit 0 ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-gnu - exit ;; + exit 0 ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; @@ -924,7 +800,7 @@ EOF objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; + exit 0 ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in @@ -932,37 +808,27 @@ EOF PA8*) echo hppa2.0-unknown-linux-gnu ;; *) echo hppa-unknown-linux-gnu ;; esac - exit ;; + exit 0 ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-gnu - exit ;; + exit 0 ;; s390:Linux:*:* | s390x:Linux:*:*) echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sh*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; + exit 0 ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; + exit 0 ;; x86_64:Linux:*:*) echo x86_64-unknown-linux-gnu - exit ;; - xtensa:Linux:*:*) - echo xtensa-unknown-linux-gnu - exit ;; + exit 0 ;; i*86:Linux:*:*) # The BFD linker knows what the default object file format is, so # first see if it will tell us. cd to the root directory to prevent # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ + ld_supported_targets=`cd /; ld --help 2>&1 \ | sed -ne '/supported targets:/!d s/[ ][ ]*/ /g s/.*supported targets: *// @@ -974,58 +840,52 @@ EOF ;; a.out-i386-linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; + exit 0 ;; coff-i386) echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit ;; + exit 0 ;; "") # Either a pre-BFD a.out linker (linux-gnuoldld) or # one that does not give us useful --help. echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; + exit 0 ;; esac # Determine whether the default compiler is a.out or elf eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif + cat >$dummy.c < +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif +#ifdef __ELF__ +# ifdef __GLIBC__ +# if __GLIBC__ >= 2 + printf ("%s-pc-linux-gnu\n", argv[1]); +# else + printf ("%s-pc-linux-gnulibc1\n", argv[1]); +# endif +# else + printf ("%s-pc-linux-gnulibc1\n", argv[1]); +# endif +#else + printf ("%s-pc-linux-gnuaout\n", argv[1]); +#endif + return 0; +} EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm -f $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 - exit ;; + exit 0 ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... @@ -1033,27 +893,7 @@ EOF # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; + exit 0 ;; i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then @@ -1061,100 +901,99 @@ EOF else echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. + exit 0 ;; + i*86:*:5:[78]*) case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; + exit 0 ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ + UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')` + (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 + (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ + (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi - exit ;; + exit 0 ;; + i*86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp + exit 0 ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i386. echo i386-pc-msdosdjgpp - exit ;; + exit 0 ;; Intel:Mach:3*:*) echo i386-pc-mach3 - exit ;; + exit 0 ;; paragon:*:*:*) echo i860-intel-osf1 - exit ;; + exit 0 ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 fi - exit ;; + exit 0 ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) + exit 0 ;; + M68*:*:R3V[567]*:*) + test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } + && echo i486-ncr-sysv4.3${OS_REL} && exit 0 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; + && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; + && echo i486-ncr-sysv4 && exit 0 ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 - exit ;; + exit 0 ;; + i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) + echo i386-unknown-lynxos${UNAME_RELEASE} + exit 0 ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; + exit 0 ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} - exit ;; + exit 0 ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 - exit ;; + exit 0 ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` @@ -1162,107 +1001,82 @@ EOF else echo ns32k-sni-sysv fi - exit ;; + exit 0 ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says echo i586-unisys-sysv4 - exit ;; + exit 0 ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes . # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 - exit ;; + exit 0 ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; + exit 0 ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos - exit ;; + exit 0 ;; mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} - exit ;; + exit 0 ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 - exit ;; + exit 0 ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else echo mips-unknown-sysv${UNAME_RELEASE} fi - exit ;; + exit 0 ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos - exit ;; + exit 0 ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos - exit ;; + exit 0 ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos - exit ;; + exit 0 ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; + exit 0 ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Rhapsody:*:*) echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; + echo `uname -p`-apple-darwin${UNAME_RELEASE} + exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 + if test "${UNAME_MACHINE}" = "x86pc"; then UNAME_MACHINE=pc fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; + echo `uname -p`-${UNAME_MACHINE}-nto-qnx + exit 0 ;; *:QNX:*:4*) echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) + exit 0 ;; + NSR-[KW]:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; + exit 0 ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux - exit ;; + exit 0 ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv - exit ;; + exit 0 ;; DS/*:UNIX_System_V:*:*) echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; + exit 0 ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 @@ -1273,47 +1087,36 @@ EOF UNAME_MACHINE="$cputype" fi echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; + exit 0 ;; + i*86:OS/2:*:*) + # If we were able to find `uname', then EMX Unix compatibility + # is probably installed. + echo ${UNAME_MACHINE}-pc-os2-emx + exit 0 ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 - exit ;; + exit 0 ;; *:TENEX:*:*) echo pdp10-unknown-tenex - exit ;; + exit 0 ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 - exit ;; + exit 0 ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 - exit ;; + exit 0 ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 - exit ;; + exit 0 ;; *:ITS:*:*) echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; + exit 0 ;; + i*86:XTS-300:*:STOP) + echo ${UNAME_MACHINE}-unknown-stop + exit 0 ;; + i*86:atheos:*:*) + echo ${UNAME_MACHINE}-unknown-atheos + exit 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 @@ -1345,7 +1148,7 @@ main () #endif #if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); + printf ("arm-acorn-riscix"); exit (0); #endif #if defined (hp300) && !defined (hpux) @@ -1434,12 +1237,12 @@ main () } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } +$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm -f $dummy.c $dummy && exit 0 +rm -f $dummy.c $dummy # Apollos put the system type in the environment. -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } +test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } # Convex versions that predate uname can use getsysinfo(1) @@ -1448,22 +1251,22 @@ then case `getsysinfo -f cpu_type` in c1*) echo c1-convex-bsd - exit ;; + exit 0 ;; c2*) if getsysinfo -f scalar_acc then echo c32-convex-bsd else echo c2-convex-bsd fi - exit ;; + exit 0 ;; c34*) echo c34-convex-bsd - exit ;; + exit 0 ;; c38*) echo c38-convex-bsd - exit ;; + exit 0 ;; c4*) echo c4-convex-bsd - exit ;; + exit 0 ;; esac fi @@ -1474,9 +1277,7 @@ This script, last modified $timestamp, has failed to recognize the operating system you are using. It is advised that you download the most up to date version of the config scripts from - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess -and - http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub + ftp://ftp.gnu.org/pub/gnu/config/ If the version you run ($0) is already up to date, please send the following data and any information you think might be diff --git a/libs/pjproject-1.0.1/config.log b/libs/pjproject-1.0.1/config.log new file mode 100644 index 0000000000000000000000000000000000000000..d114a898e306ff8d9d6839f1f7a28fb37193b78c --- /dev/null +++ b/libs/pjproject-1.0.1/config.log @@ -0,0 +1,3066 @@ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by pjproject aconfigure 1.0, which was +generated by GNU Autoconf 2.59. Invocation command line was + + $ ./aconfigure + +## --------- ## +## Platform. ## +## --------- ## + +hostname = sulfur +uname -m = i686 +uname -r = 2.6.27-11-generic +uname -s = Linux +uname -v = #1 SMP Thu Jan 29 19:24:39 UTC 2009 + +/usr/bin/uname -p = unknown +/bin/uname -X = unknown + +/bin/arch = unknown +/usr/bin/arch -k = unknown +/usr/convex/getsysinfo = unknown +hostinfo = unknown +/bin/machine = unknown +/usr/bin/oslevel = unknown +/bin/universe = unknown + +PATH: /usr/local/sbin +PATH: /usr/local/bin +PATH: /usr/sbin +PATH: /usr/bin +PATH: /sbin +PATH: /bin +PATH: /usr/games +PATH: /usr/local/share/OpenSceneGraph/bin + + +## ----------- ## +## Core tests. ## +## ----------- ## + +aconfigure:1377: checking build system type +aconfigure:1395: result: i686-pc-linux-gnu +aconfigure:1403: checking host system type +aconfigure:1417: result: i686-pc-linux-gnu +aconfigure:1425: checking target system type +aconfigure:1439: result: i686-pc-linux-gnu +aconfigure:1513: checking for gcc +aconfigure:1529: found /usr/bin/gcc +aconfigure:1539: result: gcc +aconfigure:1783: checking for C compiler version +aconfigure:1786: gcc --version &5 +gcc (Ubuntu 4.3.2-1ubuntu12) 4.3.2 +Copyright (C) 2008 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +aconfigure:1789: $? = 0 +aconfigure:1791: gcc -v &5 +Using built-in specs. +Target: i486-linux-gnu +Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.2-1ubuntu12' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-targets=all --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu +Thread model: posix +gcc version 4.3.2 (Ubuntu 4.3.2-1ubuntu12) +aconfigure:1794: $? = 0 +aconfigure:1796: gcc -V &5 +gcc: '-V' option must have argument +aconfigure:1799: $? = 1 +aconfigure:1822: checking for C compiler default output file name +aconfigure:1825: gcc -O2 conftest.c >&5 +aconfigure:1828: $? = 0 +aconfigure:1874: result: a.out +aconfigure:1879: checking whether the C compiler works +aconfigure:1885: ./a.out +aconfigure:1888: $? = 0 +aconfigure:1905: result: yes +aconfigure:1912: checking whether we are cross compiling +aconfigure:1914: result: no +aconfigure:1917: checking for suffix of executables +aconfigure:1919: gcc -o conftest -O2 conftest.c >&5 +aconfigure:1922: $? = 0 +aconfigure:1947: result: +aconfigure:1953: checking for suffix of object files +aconfigure:1974: gcc -c -O2 conftest.c >&5 +aconfigure:1977: $? = 0 +aconfigure:1999: result: o +aconfigure:2003: checking whether we are using the GNU C compiler +aconfigure:2027: gcc -c -O2 conftest.c >&5 +aconfigure:2033: $? = 0 +aconfigure:2037: test -z + || test ! -s conftest.err +aconfigure:2040: $? = 0 +aconfigure:2043: test -s conftest.o +aconfigure:2046: $? = 0 +aconfigure:2059: result: yes +aconfigure:2065: checking whether gcc accepts -g +aconfigure:2086: gcc -c -g conftest.c >&5 +aconfigure:2092: $? = 0 +aconfigure:2096: test -z + || test ! -s conftest.err +aconfigure:2099: $? = 0 +aconfigure:2102: test -s conftest.o +aconfigure:2105: $? = 0 +aconfigure:2116: result: yes +aconfigure:2133: checking for gcc option to accept ANSI C +aconfigure:2203: gcc -c -O2 conftest.c >&5 +aconfigure:2209: $? = 0 +aconfigure:2213: test -z + || test ! -s conftest.err +aconfigure:2216: $? = 0 +aconfigure:2219: test -s conftest.o +aconfigure:2222: $? = 0 +aconfigure:2240: result: none needed +aconfigure:2258: gcc -c -O2 conftest.c >&5 +conftest.c:2: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'me' +aconfigure:2264: $? = 1 +aconfigure: failed program was: +| #ifndef __cplusplus +| choke me +| #endif +aconfigure:2449: checking for g++ +aconfigure:2465: found /usr/bin/g++ +aconfigure:2475: result: g++ +aconfigure:2491: checking for C++ compiler version +aconfigure:2494: g++ --version &5 +g++ (Ubuntu 4.3.2-1ubuntu12) 4.3.2 +Copyright (C) 2008 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +aconfigure:2497: $? = 0 +aconfigure:2499: g++ -v &5 +Using built-in specs. +Target: i486-linux-gnu +Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.2-1ubuntu12' --with-bugurl=file:///usr/share/doc/gcc-4.3/README.Bugs --enable-languages=c,c++,fortran,objc,obj-c++ --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --with-gxx-include-dir=/usr/include/c++/4.3 --program-suffix=-4.3 --enable-clocale=gnu --enable-libstdcxx-debug --enable-objc-gc --enable-mpfr --enable-targets=all --enable-checking=release --build=i486-linux-gnu --host=i486-linux-gnu --target=i486-linux-gnu +Thread model: posix +gcc version 4.3.2 (Ubuntu 4.3.2-1ubuntu12) +aconfigure:2502: $? = 0 +aconfigure:2504: g++ -V &5 +g++: '-V' option must have argument +aconfigure:2507: $? = 1 +aconfigure:2510: checking whether we are using the GNU C++ compiler +aconfigure:2534: g++ -c -O2 conftest.cc >&5 +aconfigure:2540: $? = 0 +aconfigure:2544: test -z + || test ! -s conftest.err +aconfigure:2547: $? = 0 +aconfigure:2550: test -s conftest.o +aconfigure:2553: $? = 0 +aconfigure:2566: result: yes +aconfigure:2572: checking whether g++ accepts -g +aconfigure:2593: g++ -c -g conftest.cc >&5 +aconfigure:2599: $? = 0 +aconfigure:2603: test -z + || test ! -s conftest.err +aconfigure:2606: $? = 0 +aconfigure:2609: test -s conftest.o +aconfigure:2612: $? = 0 +aconfigure:2623: result: yes +aconfigure:2665: g++ -c -O2 conftest.cc >&5 +aconfigure:2671: $? = 0 +aconfigure:2675: test -z + || test ! -s conftest.err +aconfigure:2678: $? = 0 +aconfigure:2681: test -s conftest.o +aconfigure:2684: $? = 0 +aconfigure:2710: g++ -c -O2 conftest.cc >&5 +conftest.cc: In function 'int main()': +conftest.cc:13: error: 'exit' was not declared in this scope +aconfigure:2716: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| /* end confdefs.h. */ +| +| int +| main () +| { +| exit (42); +| ; +| return 0; +| } +aconfigure:2665: g++ -c -O2 conftest.cc >&5 +conftest.cc:9: error: 'void std::exit(int)' should have been declared inside 'std' +aconfigure:2671: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| /* end confdefs.h. */ +| extern "C" void std::exit (int) throw (); using std::exit; +| #include +| int +| main () +| { +| exit (42); +| ; +| return 0; +| } +aconfigure:2665: g++ -c -O2 conftest.cc >&5 +conftest.cc:9: error: 'void std::exit(int)' should have been declared inside 'std' +In file included from conftest.cc:10: +/usr/include/stdlib.h:531: error: declaration of 'void std::exit(int) throw ()' throws different exceptions +conftest.cc:9: error: from previous declaration 'void std::exit(int)' +aconfigure:2671: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| /* end confdefs.h. */ +| extern "C" void std::exit (int); using std::exit; +| #include +| int +| main () +| { +| exit (42); +| ; +| return 0; +| } +aconfigure:2665: g++ -c -O2 conftest.cc >&5 +aconfigure:2671: $? = 0 +aconfigure:2675: test -z + || test ! -s conftest.err +aconfigure:2678: $? = 0 +aconfigure:2681: test -s conftest.o +aconfigure:2684: $? = 0 +aconfigure:2710: g++ -c -O2 conftest.cc >&5 +aconfigure:2716: $? = 0 +aconfigure:2720: test -z + || test ! -s conftest.err +aconfigure:2723: $? = 0 +aconfigure:2726: test -s conftest.o +aconfigure:2729: $? = 0 +aconfigure:2772: checking for pthread_create in -lpthread +aconfigure:2802: gcc -o conftest -O2 conftest.c -lpthread >&5 +aconfigure:2808: $? = 0 +aconfigure:2812: test -z + || test ! -s conftest.err +aconfigure:2815: $? = 0 +aconfigure:2818: test -s conftest +aconfigure:2821: $? = 0 +aconfigure:2834: result: yes +aconfigure:2846: checking for puts in -lwsock32 +aconfigure:2876: gcc -o conftest -O2 conftest.c -lwsock32 -lpthread >&5 +conftest.c:20: warning: conflicting types for built-in function 'puts' +/usr/bin/ld: cannot find -lwsock32 +collect2: ld returned 1 exit status +aconfigure:2882: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| /* end confdefs.h. */ +| +| /* Override any gcc2 internal prototype to avoid an error. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| /* We use char because int might match the return type of a gcc2 +| builtin and then its argument prototype would still apply. */ +| char puts (); +| int +| main () +| { +| puts (); +| ; +| return 0; +| } +aconfigure:2908: result: no +aconfigure:2920: checking for puts in -lws2_32 +aconfigure:2950: gcc -o conftest -O2 conftest.c -lws2_32 -lpthread >&5 +conftest.c:20: warning: conflicting types for built-in function 'puts' +/usr/bin/ld: cannot find -lws2_32 +collect2: ld returned 1 exit status +aconfigure:2956: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| /* end confdefs.h. */ +| +| /* Override any gcc2 internal prototype to avoid an error. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| /* We use char because int might match the return type of a gcc2 +| builtin and then its argument prototype would still apply. */ +| char puts (); +| int +| main () +| { +| puts (); +| ; +| return 0; +| } +aconfigure:2982: result: no +aconfigure:2994: checking for puts in -lole32 +aconfigure:3024: gcc -o conftest -O2 conftest.c -lole32 -lpthread >&5 +conftest.c:20: warning: conflicting types for built-in function 'puts' +/usr/bin/ld: cannot find -lole32 +collect2: ld returned 1 exit status +aconfigure:3030: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| /* end confdefs.h. */ +| +| /* Override any gcc2 internal prototype to avoid an error. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| /* We use char because int might match the return type of a gcc2 +| builtin and then its argument prototype would still apply. */ +| char puts (); +| int +| main () +| { +| puts (); +| ; +| return 0; +| } +aconfigure:3056: result: no +aconfigure:3068: checking for puts in -lwinmm +aconfigure:3098: gcc -o conftest -O2 conftest.c -lwinmm -lpthread >&5 +conftest.c:20: warning: conflicting types for built-in function 'puts' +/usr/bin/ld: cannot find -lwinmm +collect2: ld returned 1 exit status +aconfigure:3104: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| /* end confdefs.h. */ +| +| /* Override any gcc2 internal prototype to avoid an error. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| /* We use char because int might match the return type of a gcc2 +| builtin and then its argument prototype would still apply. */ +| char puts (); +| int +| main () +| { +| puts (); +| ; +| return 0; +| } +aconfigure:3130: result: no +aconfigure:3142: checking for puts in -lsocket +aconfigure:3172: gcc -o conftest -O2 conftest.c -lsocket -lpthread >&5 +conftest.c:20: warning: conflicting types for built-in function 'puts' +/usr/bin/ld: cannot find -lsocket +collect2: ld returned 1 exit status +aconfigure:3178: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| /* end confdefs.h. */ +| +| /* Override any gcc2 internal prototype to avoid an error. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| /* We use char because int might match the return type of a gcc2 +| builtin and then its argument prototype would still apply. */ +| char puts (); +| int +| main () +| { +| puts (); +| ; +| return 0; +| } +aconfigure:3204: result: no +aconfigure:3216: checking for puts in -lrt +aconfigure:3246: gcc -o conftest -O2 conftest.c -lrt -lpthread >&5 +conftest.c:20: warning: conflicting types for built-in function 'puts' +aconfigure:3252: $? = 0 +aconfigure:3256: test -z + || test ! -s conftest.err +aconfigure:3259: $? = 0 +aconfigure:3262: test -s conftest +aconfigure:3265: $? = 0 +aconfigure:3278: result: yes +aconfigure:3290: checking for puts in -lnsl +aconfigure:3320: gcc -o conftest -O2 conftest.c -lnsl -lrt -lpthread >&5 +conftest.c:21: warning: conflicting types for built-in function 'puts' +aconfigure:3326: $? = 0 +aconfigure:3330: test -z + || test ! -s conftest.err +aconfigure:3333: $? = 0 +aconfigure:3336: test -s conftest +aconfigure:3339: $? = 0 +aconfigure:3352: result: yes +aconfigure:3364: checking for uuid_generate in -luuid +aconfigure:3394: gcc -o conftest -O2 conftest.c -luuid -lnsl -lrt -lpthread >&5 +/usr/bin/ld: cannot find -luuid +collect2: ld returned 1 exit status +aconfigure:3400: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| /* end confdefs.h. */ +| +| /* Override any gcc2 internal prototype to avoid an error. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| /* We use char because int might match the return type of a gcc2 +| builtin and then its argument prototype would still apply. */ +| char uuid_generate (); +| int +| main () +| { +| uuid_generate (); +| ; +| return 0; +| } +aconfigure:3426: result: no +aconfigure:3437: checking for uuid_generate in -luuid +aconfigure:3499: result: no +aconfigure:3506: result: Setting PJ_M_NAME to i686 +aconfigure:3513: checking memory alignment +aconfigure:3529: result: 4 bytes (default) +aconfigure:3535: checking whether byte ordering is bigendian +aconfigure:3562: gcc -c -O2 conftest.c >&5 +aconfigure:3568: $? = 0 +aconfigure:3572: test -z + || test ! -s conftest.err +aconfigure:3575: $? = 0 +aconfigure:3578: test -s conftest.o +aconfigure:3581: $? = 0 +aconfigure:3605: gcc -c -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:24: error: 'not' undeclared (first use in this function) +conftest.c:24: error: (Each undeclared identifier is reported only once +conftest.c:24: error: for each function it appears in.) +conftest.c:24: error: expected ';' before 'big' +aconfigure:3611: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| /* end confdefs.h. */ +| #include +| #include +| +| int +| main () +| { +| #if BYTE_ORDER != BIG_ENDIAN +| not big endian +| #endif +| +| ; +| return 0; +| } +aconfigure:3746: result: no +aconfigure:3829: result: Checking if floating point is disabled... no +aconfigure:3832: checking for fmod in -lm +aconfigure:3862: gcc -o conftest -O2 conftest.c -lm -lnsl -lrt -lpthread >&5 +conftest.c:26: warning: conflicting types for built-in function 'fmod' +aconfigure:3868: $? = 0 +aconfigure:3872: test -z + || test ! -s conftest.err +aconfigure:3875: $? = 0 +aconfigure:3878: test -s conftest +aconfigure:3881: $? = 0 +aconfigure:3894: result: yes +aconfigure:3914: checking how to run the C preprocessor +aconfigure:3949: gcc -E conftest.c +aconfigure:3955: $? = 0 +aconfigure:3987: gcc -E conftest.c +conftest.c:20:28: error: ac_nonexistent.h: No such file or directory +aconfigure:3993: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| #include +aconfigure:4032: result: gcc -E +aconfigure:4056: gcc -E conftest.c +aconfigure:4062: $? = 0 +aconfigure:4094: gcc -E conftest.c +conftest.c:20:28: error: ac_nonexistent.h: No such file or directory +aconfigure:4100: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| #include +aconfigure:4144: checking for egrep +aconfigure:4154: result: grep -E +aconfigure:4159: checking for ANSI C header files +aconfigure:4184: gcc -c -O2 conftest.c >&5 +aconfigure:4190: $? = 0 +aconfigure:4194: test -z + || test ! -s conftest.err +aconfigure:4197: $? = 0 +aconfigure:4200: test -s conftest.o +aconfigure:4203: $? = 0 +aconfigure:4292: gcc -o conftest -O2 conftest.c -lm -lnsl -lrt -lpthread >&5 +conftest.c: In function 'main': +conftest.c:37: warning: incompatible implicit declaration of built-in function 'exit' +aconfigure:4295: $? = 0 +aconfigure:4297: ./conftest +aconfigure:4300: $? = 0 +aconfigure:4315: result: yes +aconfigure:4339: checking for sys/types.h +aconfigure:4355: gcc -c -O2 conftest.c >&5 +aconfigure:4361: $? = 0 +aconfigure:4365: test -z + || test ! -s conftest.err +aconfigure:4368: $? = 0 +aconfigure:4371: test -s conftest.o +aconfigure:4374: $? = 0 +aconfigure:4385: result: yes +aconfigure:4339: checking for sys/stat.h +aconfigure:4355: gcc -c -O2 conftest.c >&5 +aconfigure:4361: $? = 0 +aconfigure:4365: test -z + || test ! -s conftest.err +aconfigure:4368: $? = 0 +aconfigure:4371: test -s conftest.o +aconfigure:4374: $? = 0 +aconfigure:4385: result: yes +aconfigure:4339: checking for stdlib.h +aconfigure:4355: gcc -c -O2 conftest.c >&5 +aconfigure:4361: $? = 0 +aconfigure:4365: test -z + || test ! -s conftest.err +aconfigure:4368: $? = 0 +aconfigure:4371: test -s conftest.o +aconfigure:4374: $? = 0 +aconfigure:4385: result: yes +aconfigure:4339: checking for string.h +aconfigure:4355: gcc -c -O2 conftest.c >&5 +aconfigure:4361: $? = 0 +aconfigure:4365: test -z + || test ! -s conftest.err +aconfigure:4368: $? = 0 +aconfigure:4371: test -s conftest.o +aconfigure:4374: $? = 0 +aconfigure:4385: result: yes +aconfigure:4339: checking for memory.h +aconfigure:4355: gcc -c -O2 conftest.c >&5 +aconfigure:4361: $? = 0 +aconfigure:4365: test -z + || test ! -s conftest.err +aconfigure:4368: $? = 0 +aconfigure:4371: test -s conftest.o +aconfigure:4374: $? = 0 +aconfigure:4385: result: yes +aconfigure:4339: checking for strings.h +aconfigure:4355: gcc -c -O2 conftest.c >&5 +aconfigure:4361: $? = 0 +aconfigure:4365: test -z + || test ! -s conftest.err +aconfigure:4368: $? = 0 +aconfigure:4371: test -s conftest.o +aconfigure:4374: $? = 0 +aconfigure:4385: result: yes +aconfigure:4339: checking for inttypes.h +aconfigure:4355: gcc -c -O2 conftest.c >&5 +aconfigure:4361: $? = 0 +aconfigure:4365: test -z + || test ! -s conftest.err +aconfigure:4368: $? = 0 +aconfigure:4371: test -s conftest.o +aconfigure:4374: $? = 0 +aconfigure:4385: result: yes +aconfigure:4339: checking for stdint.h +aconfigure:4355: gcc -c -O2 conftest.c >&5 +aconfigure:4361: $? = 0 +aconfigure:4365: test -z + || test ! -s conftest.err +aconfigure:4368: $? = 0 +aconfigure:4371: test -s conftest.o +aconfigure:4374: $? = 0 +aconfigure:4385: result: yes +aconfigure:4339: checking for unistd.h +aconfigure:4355: gcc -c -O2 conftest.c >&5 +aconfigure:4361: $? = 0 +aconfigure:4365: test -z + || test ! -s conftest.err +aconfigure:4368: $? = 0 +aconfigure:4371: test -s conftest.o +aconfigure:4374: $? = 0 +aconfigure:4385: result: yes +aconfigure:4407: checking arpa/inet.h usability +aconfigure:4419: gcc -c -O2 conftest.c >&5 +aconfigure:4425: $? = 0 +aconfigure:4429: test -z + || test ! -s conftest.err +aconfigure:4432: $? = 0 +aconfigure:4435: test -s conftest.o +aconfigure:4438: $? = 0 +aconfigure:4448: result: yes +aconfigure:4452: checking arpa/inet.h presence +aconfigure:4462: gcc -E conftest.c +aconfigure:4468: $? = 0 +aconfigure:4488: result: yes +aconfigure:4523: checking for arpa/inet.h +aconfigure:4530: result: yes +aconfigure:4552: checking assert.h usability +aconfigure:4564: gcc -c -O2 conftest.c >&5 +aconfigure:4570: $? = 0 +aconfigure:4574: test -z + || test ! -s conftest.err +aconfigure:4577: $? = 0 +aconfigure:4580: test -s conftest.o +aconfigure:4583: $? = 0 +aconfigure:4593: result: yes +aconfigure:4597: checking assert.h presence +aconfigure:4607: gcc -E conftest.c +aconfigure:4613: $? = 0 +aconfigure:4633: result: yes +aconfigure:4668: checking for assert.h +aconfigure:4675: result: yes +aconfigure:4697: checking ctype.h usability +aconfigure:4709: gcc -c -O2 conftest.c >&5 +aconfigure:4715: $? = 0 +aconfigure:4719: test -z + || test ! -s conftest.err +aconfigure:4722: $? = 0 +aconfigure:4725: test -s conftest.o +aconfigure:4728: $? = 0 +aconfigure:4738: result: yes +aconfigure:4742: checking ctype.h presence +aconfigure:4752: gcc -E conftest.c +aconfigure:4758: $? = 0 +aconfigure:4778: result: yes +aconfigure:4813: checking for ctype.h +aconfigure:4820: result: yes +aconfigure:4851: checking errno.h usability +aconfigure:4863: gcc -c -O2 conftest.c >&5 +aconfigure:4869: $? = 0 +aconfigure:4873: test -z + || test ! -s conftest.err +aconfigure:4876: $? = 0 +aconfigure:4879: test -s conftest.o +aconfigure:4882: $? = 0 +aconfigure:4892: result: yes +aconfigure:4896: checking errno.h presence +aconfigure:4906: gcc -E conftest.c +aconfigure:4912: $? = 0 +aconfigure:4932: result: yes +aconfigure:4967: checking for errno.h +aconfigure:4974: result: yes +aconfigure:4999: checking fcntl.h usability +aconfigure:5011: gcc -c -O2 conftest.c >&5 +aconfigure:5017: $? = 0 +aconfigure:5021: test -z + || test ! -s conftest.err +aconfigure:5024: $? = 0 +aconfigure:5027: test -s conftest.o +aconfigure:5030: $? = 0 +aconfigure:5040: result: yes +aconfigure:5044: checking fcntl.h presence +aconfigure:5054: gcc -E conftest.c +aconfigure:5060: $? = 0 +aconfigure:5080: result: yes +aconfigure:5115: checking for fcntl.h +aconfigure:5122: result: yes +aconfigure:5144: checking linux/socket.h usability +aconfigure:5156: gcc -c -O2 conftest.c >&5 +aconfigure:5162: $? = 0 +aconfigure:5166: test -z + || test ! -s conftest.err +aconfigure:5169: $? = 0 +aconfigure:5172: test -s conftest.o +aconfigure:5175: $? = 0 +aconfigure:5185: result: yes +aconfigure:5189: checking linux/socket.h presence +aconfigure:5199: gcc -E conftest.c +aconfigure:5205: $? = 0 +aconfigure:5225: result: yes +aconfigure:5260: checking for linux/socket.h +aconfigure:5267: result: yes +aconfigure:5289: checking malloc.h usability +aconfigure:5301: gcc -c -O2 conftest.c >&5 +aconfigure:5307: $? = 0 +aconfigure:5311: test -z + || test ! -s conftest.err +aconfigure:5314: $? = 0 +aconfigure:5317: test -s conftest.o +aconfigure:5320: $? = 0 +aconfigure:5330: result: yes +aconfigure:5334: checking malloc.h presence +aconfigure:5344: gcc -E conftest.c +aconfigure:5350: $? = 0 +aconfigure:5370: result: yes +aconfigure:5405: checking for malloc.h +aconfigure:5412: result: yes +aconfigure:5434: checking netdb.h usability +aconfigure:5446: gcc -c -O2 conftest.c >&5 +aconfigure:5452: $? = 0 +aconfigure:5456: test -z + || test ! -s conftest.err +aconfigure:5459: $? = 0 +aconfigure:5462: test -s conftest.o +aconfigure:5465: $? = 0 +aconfigure:5475: result: yes +aconfigure:5479: checking netdb.h presence +aconfigure:5489: gcc -E conftest.c +aconfigure:5495: $? = 0 +aconfigure:5515: result: yes +aconfigure:5550: checking for netdb.h +aconfigure:5557: result: yes +aconfigure:5579: checking netinet/in_systm.h usability +aconfigure:5591: gcc -c -O2 conftest.c >&5 +aconfigure:5597: $? = 0 +aconfigure:5601: test -z + || test ! -s conftest.err +aconfigure:5604: $? = 0 +aconfigure:5607: test -s conftest.o +aconfigure:5610: $? = 0 +aconfigure:5620: result: yes +aconfigure:5624: checking netinet/in_systm.h presence +aconfigure:5634: gcc -E conftest.c +aconfigure:5640: $? = 0 +aconfigure:5660: result: yes +aconfigure:5695: checking for netinet/in_systm.h +aconfigure:5702: result: yes +aconfigure:5724: checking netinet/in.h usability +aconfigure:5736: gcc -c -O2 conftest.c >&5 +aconfigure:5742: $? = 0 +aconfigure:5746: test -z + || test ! -s conftest.err +aconfigure:5749: $? = 0 +aconfigure:5752: test -s conftest.o +aconfigure:5755: $? = 0 +aconfigure:5765: result: yes +aconfigure:5769: checking netinet/in.h presence +aconfigure:5779: gcc -E conftest.c +aconfigure:5785: $? = 0 +aconfigure:5805: result: yes +aconfigure:5840: checking for netinet/in.h +aconfigure:5847: result: yes +aconfigure:5859: checking for netinet/ip.h +aconfigure:5878: gcc -c -O2 conftest.c >&5 +aconfigure:5884: $? = 0 +aconfigure:5888: test -z + || test ! -s conftest.err +aconfigure:5891: $? = 0 +aconfigure:5894: test -s conftest.o +aconfigure:5897: $? = 0 +aconfigure:5908: result: yes +aconfigure:5928: checking ifaddrs.h usability +aconfigure:5940: gcc -c -O2 conftest.c >&5 +aconfigure:5946: $? = 0 +aconfigure:5950: test -z + || test ! -s conftest.err +aconfigure:5953: $? = 0 +aconfigure:5956: test -s conftest.o +aconfigure:5959: $? = 0 +aconfigure:5969: result: yes +aconfigure:5973: checking ifaddrs.h presence +aconfigure:5983: gcc -E conftest.c +aconfigure:5989: $? = 0 +aconfigure:6009: result: yes +aconfigure:6044: checking for ifaddrs.h +aconfigure:6051: result: yes +aconfigure:6073: checking semaphore.h usability +aconfigure:6085: gcc -c -O2 conftest.c >&5 +aconfigure:6091: $? = 0 +aconfigure:6095: test -z + || test ! -s conftest.err +aconfigure:6098: $? = 0 +aconfigure:6101: test -s conftest.o +aconfigure:6104: $? = 0 +aconfigure:6114: result: yes +aconfigure:6118: checking semaphore.h presence +aconfigure:6128: gcc -E conftest.c +aconfigure:6134: $? = 0 +aconfigure:6154: result: yes +aconfigure:6189: checking for semaphore.h +aconfigure:6196: result: yes +aconfigure:6218: checking setjmp.h usability +aconfigure:6230: gcc -c -O2 conftest.c >&5 +aconfigure:6236: $? = 0 +aconfigure:6240: test -z + || test ! -s conftest.err +aconfigure:6243: $? = 0 +aconfigure:6246: test -s conftest.o +aconfigure:6249: $? = 0 +aconfigure:6259: result: yes +aconfigure:6263: checking setjmp.h presence +aconfigure:6273: gcc -E conftest.c +aconfigure:6279: $? = 0 +aconfigure:6299: result: yes +aconfigure:6334: checking for setjmp.h +aconfigure:6341: result: yes +aconfigure:6363: checking stdarg.h usability +aconfigure:6375: gcc -c -O2 conftest.c >&5 +aconfigure:6381: $? = 0 +aconfigure:6385: test -z + || test ! -s conftest.err +aconfigure:6388: $? = 0 +aconfigure:6391: test -s conftest.o +aconfigure:6394: $? = 0 +aconfigure:6404: result: yes +aconfigure:6408: checking stdarg.h presence +aconfigure:6418: gcc -E conftest.c +aconfigure:6424: $? = 0 +aconfigure:6444: result: yes +aconfigure:6479: checking for stdarg.h +aconfigure:6486: result: yes +aconfigure:6508: checking stddef.h usability +aconfigure:6520: gcc -c -O2 conftest.c >&5 +aconfigure:6526: $? = 0 +aconfigure:6530: test -z + || test ! -s conftest.err +aconfigure:6533: $? = 0 +aconfigure:6536: test -s conftest.o +aconfigure:6539: $? = 0 +aconfigure:6549: result: yes +aconfigure:6553: checking stddef.h presence +aconfigure:6563: gcc -E conftest.c +aconfigure:6569: $? = 0 +aconfigure:6589: result: yes +aconfigure:6624: checking for stddef.h +aconfigure:6631: result: yes +aconfigure:6653: checking stdio.h usability +aconfigure:6665: gcc -c -O2 conftest.c >&5 +aconfigure:6671: $? = 0 +aconfigure:6675: test -z + || test ! -s conftest.err +aconfigure:6678: $? = 0 +aconfigure:6681: test -s conftest.o +aconfigure:6684: $? = 0 +aconfigure:6694: result: yes +aconfigure:6698: checking stdio.h presence +aconfigure:6708: gcc -E conftest.c +aconfigure:6714: $? = 0 +aconfigure:6734: result: yes +aconfigure:6769: checking for stdio.h +aconfigure:6776: result: yes +aconfigure:6789: checking for stdint.h +aconfigure:6794: result: yes +aconfigure:6934: checking for stdlib.h +aconfigure:6939: result: yes +aconfigure:7079: checking for string.h +aconfigure:7084: result: yes +aconfigure:7233: checking sys/ioctl.h usability +aconfigure:7245: gcc -c -O2 conftest.c >&5 +aconfigure:7251: $? = 0 +aconfigure:7255: test -z + || test ! -s conftest.err +aconfigure:7258: $? = 0 +aconfigure:7261: test -s conftest.o +aconfigure:7264: $? = 0 +aconfigure:7274: result: yes +aconfigure:7278: checking sys/ioctl.h presence +aconfigure:7288: gcc -E conftest.c +aconfigure:7294: $? = 0 +aconfigure:7314: result: yes +aconfigure:7349: checking for sys/ioctl.h +aconfigure:7356: result: yes +aconfigure:7378: checking sys/select.h usability +aconfigure:7390: gcc -c -O2 conftest.c >&5 +aconfigure:7396: $? = 0 +aconfigure:7400: test -z + || test ! -s conftest.err +aconfigure:7403: $? = 0 +aconfigure:7406: test -s conftest.o +aconfigure:7409: $? = 0 +aconfigure:7419: result: yes +aconfigure:7423: checking sys/select.h presence +aconfigure:7433: gcc -E conftest.c +aconfigure:7439: $? = 0 +aconfigure:7459: result: yes +aconfigure:7494: checking for sys/select.h +aconfigure:7501: result: yes +aconfigure:7523: checking sys/socket.h usability +aconfigure:7535: gcc -c -O2 conftest.c >&5 +aconfigure:7541: $? = 0 +aconfigure:7545: test -z + || test ! -s conftest.err +aconfigure:7548: $? = 0 +aconfigure:7551: test -s conftest.o +aconfigure:7554: $? = 0 +aconfigure:7564: result: yes +aconfigure:7568: checking sys/socket.h presence +aconfigure:7578: gcc -E conftest.c +aconfigure:7584: $? = 0 +aconfigure:7604: result: yes +aconfigure:7639: checking for sys/socket.h +aconfigure:7646: result: yes +aconfigure:7668: checking sys/time.h usability +aconfigure:7680: gcc -c -O2 conftest.c >&5 +aconfigure:7686: $? = 0 +aconfigure:7690: test -z + || test ! -s conftest.err +aconfigure:7693: $? = 0 +aconfigure:7696: test -s conftest.o +aconfigure:7699: $? = 0 +aconfigure:7709: result: yes +aconfigure:7713: checking sys/time.h presence +aconfigure:7723: gcc -E conftest.c +aconfigure:7729: $? = 0 +aconfigure:7749: result: yes +aconfigure:7784: checking for sys/time.h +aconfigure:7791: result: yes +aconfigure:7813: checking sys/timeb.h usability +aconfigure:7825: gcc -c -O2 conftest.c >&5 +aconfigure:7831: $? = 0 +aconfigure:7835: test -z + || test ! -s conftest.err +aconfigure:7838: $? = 0 +aconfigure:7841: test -s conftest.o +aconfigure:7844: $? = 0 +aconfigure:7854: result: yes +aconfigure:7858: checking sys/timeb.h presence +aconfigure:7868: gcc -E conftest.c +aconfigure:7874: $? = 0 +aconfigure:7894: result: yes +aconfigure:7929: checking for sys/timeb.h +aconfigure:7936: result: yes +aconfigure:7949: checking for sys/types.h +aconfigure:7954: result: yes +aconfigure:8103: checking time.h usability +aconfigure:8115: gcc -c -O2 conftest.c >&5 +aconfigure:8121: $? = 0 +aconfigure:8125: test -z + || test ! -s conftest.err +aconfigure:8128: $? = 0 +aconfigure:8131: test -s conftest.o +aconfigure:8134: $? = 0 +aconfigure:8144: result: yes +aconfigure:8148: checking time.h presence +aconfigure:8158: gcc -E conftest.c +aconfigure:8164: $? = 0 +aconfigure:8184: result: yes +aconfigure:8219: checking for time.h +aconfigure:8226: result: yes +aconfigure:8239: checking for unistd.h +aconfigure:8244: result: yes +aconfigure:8393: checking winsock.h usability +aconfigure:8405: gcc -c -O2 conftest.c >&5 +conftest.c:92:21: error: winsock.h: No such file or directory +aconfigure:8411: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| /* end confdefs.h. */ +| #include +| #if HAVE_SYS_TYPES_H +| # include +| #endif +| #if HAVE_SYS_STAT_H +| # include +| #endif +| #if STDC_HEADERS +| # include +| # include +| #else +| # if HAVE_STDLIB_H +| # include +| # endif +| #endif +| #if HAVE_STRING_H +| # if !STDC_HEADERS && HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #if HAVE_STRINGS_H +| # include +| #endif +| #if HAVE_INTTYPES_H +| # include +| #else +| # if HAVE_STDINT_H +| # include +| # endif +| #endif +| #if HAVE_UNISTD_H +| # include +| #endif +| #include +aconfigure:8434: result: no +aconfigure:8438: checking winsock.h presence +aconfigure:8448: gcc -E conftest.c +conftest.c:58:21: error: winsock.h: No such file or directory +aconfigure:8454: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| /* end confdefs.h. */ +| #include +aconfigure:8474: result: no +aconfigure:8509: checking for winsock.h +aconfigure:8516: result: no +aconfigure:8538: checking winsock2.h usability +aconfigure:8550: gcc -c -O2 conftest.c >&5 +conftest.c:92:22: error: winsock2.h: No such file or directory +aconfigure:8556: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| /* end confdefs.h. */ +| #include +| #if HAVE_SYS_TYPES_H +| # include +| #endif +| #if HAVE_SYS_STAT_H +| # include +| #endif +| #if STDC_HEADERS +| # include +| # include +| #else +| # if HAVE_STDLIB_H +| # include +| # endif +| #endif +| #if HAVE_STRING_H +| # if !STDC_HEADERS && HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #if HAVE_STRINGS_H +| # include +| #endif +| #if HAVE_INTTYPES_H +| # include +| #else +| # if HAVE_STDINT_H +| # include +| # endif +| #endif +| #if HAVE_UNISTD_H +| # include +| #endif +| #include +aconfigure:8579: result: no +aconfigure:8583: checking winsock2.h presence +aconfigure:8593: gcc -E conftest.c +conftest.c:58:22: error: winsock2.h: No such file or directory +aconfigure:8599: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| /* end confdefs.h. */ +| #include +aconfigure:8619: result: no +aconfigure:8654: checking for winsock2.h +aconfigure:8661: result: no +aconfigure:8673: checking for mswsock.h +aconfigure:8694: gcc -c -O2 conftest.c >&5 +conftest.c:65:21: error: mswsock.h: No such file or directory +aconfigure:8700: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| /* end confdefs.h. */ +| #if PJ_HAS_WINSOCK2_H +| # include +| #elif PJ_HAS_WINSOCK_H +| # include +| #endif +| +| +| #include +aconfigure:8724: result: no +aconfigure:8744: checking ws2tcpip.h usability +aconfigure:8756: gcc -c -O2 conftest.c >&5 +conftest.c:92:22: error: ws2tcpip.h: No such file or directory +aconfigure:8762: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| /* end confdefs.h. */ +| #include +| #if HAVE_SYS_TYPES_H +| # include +| #endif +| #if HAVE_SYS_STAT_H +| # include +| #endif +| #if STDC_HEADERS +| # include +| # include +| #else +| # if HAVE_STDLIB_H +| # include +| # endif +| #endif +| #if HAVE_STRING_H +| # if !STDC_HEADERS && HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #if HAVE_STRINGS_H +| # include +| #endif +| #if HAVE_INTTYPES_H +| # include +| #else +| # if HAVE_STDINT_H +| # include +| # endif +| #endif +| #if HAVE_UNISTD_H +| # include +| #endif +| #include +aconfigure:8785: result: no +aconfigure:8789: checking ws2tcpip.h presence +aconfigure:8799: gcc -E conftest.c +conftest.c:58:22: error: ws2tcpip.h: No such file or directory +aconfigure:8805: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| /* end confdefs.h. */ +| #include +aconfigure:8825: result: no +aconfigure:8860: checking for ws2tcpip.h +aconfigure:8867: result: no +aconfigure:8889: checking uuid/uuid.h usability +aconfigure:8901: gcc -c -O2 conftest.c >&5 +conftest.c:92:23: error: uuid/uuid.h: No such file or directory +aconfigure:8907: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| /* end confdefs.h. */ +| #include +| #if HAVE_SYS_TYPES_H +| # include +| #endif +| #if HAVE_SYS_STAT_H +| # include +| #endif +| #if STDC_HEADERS +| # include +| # include +| #else +| # if HAVE_STDLIB_H +| # include +| # endif +| #endif +| #if HAVE_STRING_H +| # if !STDC_HEADERS && HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #if HAVE_STRINGS_H +| # include +| #endif +| #if HAVE_INTTYPES_H +| # include +| #else +| # if HAVE_STDINT_H +| # include +| # endif +| #endif +| #if HAVE_UNISTD_H +| # include +| #endif +| #include +aconfigure:8930: result: no +aconfigure:8934: checking uuid/uuid.h presence +aconfigure:8944: gcc -E conftest.c +conftest.c:58:23: error: uuid/uuid.h: No such file or directory +aconfigure:8950: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| /* end confdefs.h. */ +| #include +aconfigure:8970: result: no +aconfigure:9005: checking for uuid/uuid.h +aconfigure:9012: result: no +aconfigure:9021: checking for net/if.h +aconfigure:9040: gcc -c -O2 conftest.c >&5 +aconfigure:9046: $? = 0 +aconfigure:9050: test -z + || test ! -s conftest.err +aconfigure:9053: $? = 0 +aconfigure:9056: test -s conftest.o +aconfigure:9059: $? = 0 +aconfigure:9070: result: yes +aconfigure:9081: result: Setting PJ_OS_NAME to i686-pc-linux-gnu +aconfigure:9088: result: Setting PJ_HAS_ERRNO_VAR to 1 +aconfigure:9095: result: Setting PJ_HAS_HIGH_RES_TIMER to 1 +aconfigure:9102: result: Setting PJ_HAS_MALLOC to 1 +aconfigure:9109: result: Setting PJ_NATIVE_STRING_IS_UNICODE to 0 +aconfigure:9116: result: Setting PJ_ATOMIC_VALUE_TYPE to long +aconfigure:9123: checking if inet_aton() is available +aconfigure:9143: gcc -c -O2 conftest.c >&5 +aconfigure:9149: $? = 0 +aconfigure:9153: test -z + || test ! -s conftest.err +aconfigure:9156: $? = 0 +aconfigure:9159: test -s conftest.o +aconfigure:9162: $? = 0 +aconfigure:9168: result: yes +aconfigure:9179: checking if inet_pton() is available +aconfigure:9199: gcc -c -O2 conftest.c >&5 +aconfigure:9205: $? = 0 +aconfigure:9209: test -z + || test ! -s conftest.err +aconfigure:9212: $? = 0 +aconfigure:9215: test -s conftest.o +aconfigure:9218: $? = 0 +aconfigure:9224: result: yes +aconfigure:9235: checking if inet_ntop() is available +aconfigure:9255: gcc -c -O2 conftest.c >&5 +aconfigure:9261: $? = 0 +aconfigure:9265: test -z + || test ! -s conftest.err +aconfigure:9268: $? = 0 +aconfigure:9271: test -s conftest.o +aconfigure:9274: $? = 0 +aconfigure:9280: result: yes +aconfigure:9291: checking if getaddrinfo() is available +aconfigure:9311: gcc -c -O2 conftest.c >&5 +aconfigure:9317: $? = 0 +aconfigure:9321: test -z + || test ! -s conftest.err +aconfigure:9324: $? = 0 +aconfigure:9327: test -s conftest.o +aconfigure:9330: $? = 0 +aconfigure:9336: result: yes +aconfigure:9347: checking if sockaddr_in has sin_len member +aconfigure:9368: gcc -c -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:76: error: 'struct sockaddr_in' has no member named 'sin_len' +aconfigure:9374: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| #define PJ_HAS_NET_IF_H 1 +| #define PJ_OS_NAME "i686-pc-linux-gnu" +| #define PJ_HAS_ERRNO_VAR 1 +| #define PJ_HAS_HIGH_RES_TIMER 1 +| #define PJ_HAS_MALLOC 1 +| #define PJ_NATIVE_STRING_IS_UNICODE 0 +| #define PJ_ATOMIC_VALUE_TYPE long +| #define PJ_SOCK_HAS_INET_ATON 1 +| #define PJ_SOCK_HAS_INET_PTON 1 +| #define PJ_SOCK_HAS_INET_NTOP 1 +| #define PJ_SOCK_HAS_GETADDRINFO 1 +| /* end confdefs.h. */ +| #include +| #include +| #include +| #include +| int +| main () +| { +| struct sockaddr_in a; a.sin_len=0; +| ; +| return 0; +| } +aconfigure:9399: result: no +aconfigure:9404: checking if socklen_t is available +aconfigure:9422: gcc -c -O2 conftest.c >&5 +aconfigure:9428: $? = 0 +aconfigure:9432: test -z + || test ! -s conftest.err +aconfigure:9435: $? = 0 +aconfigure:9438: test -s conftest.o +aconfigure:9441: $? = 0 +aconfigure:9447: result: yes +aconfigure:9458: checking if SO_ERROR is available +aconfigure:9489: gcc -c -O2 conftest.c >&5 +aconfigure:9495: $? = 0 +aconfigure:9499: test -z + || test ! -s conftest.err +aconfigure:9502: $? = 0 +aconfigure:9505: test -s conftest.o +aconfigure:9508: $? = 0 +aconfigure:9514: result: yes +aconfigure:9528: checking if pthread_rwlock_t is available +aconfigure:9546: gcc -c -O2 conftest.c >&5 +aconfigure:9552: $? = 0 +aconfigure:9556: test -z + || test ! -s conftest.err +aconfigure:9559: $? = 0 +aconfigure:9562: test -s conftest.o +aconfigure:9565: $? = 0 +aconfigure:9572: result: yes +aconfigure:9650: checking if pthread_mutexattr_settype() is available +aconfigure:9668: gcc -c -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:76: error: 'PTHREAD_MUTEX_FAST_NP' undeclared (first use in this function) +conftest.c:76: error: (Each undeclared identifier is reported only once +conftest.c:76: error: for each function it appears in.) +aconfigure:9674: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| #define PJ_HAS_NET_IF_H 1 +| #define PJ_OS_NAME "i686-pc-linux-gnu" +| #define PJ_HAS_ERRNO_VAR 1 +| #define PJ_HAS_HIGH_RES_TIMER 1 +| #define PJ_HAS_MALLOC 1 +| #define PJ_NATIVE_STRING_IS_UNICODE 0 +| #define PJ_ATOMIC_VALUE_TYPE long +| #define PJ_SOCK_HAS_INET_ATON 1 +| #define PJ_SOCK_HAS_INET_PTON 1 +| #define PJ_SOCK_HAS_INET_NTOP 1 +| #define PJ_SOCK_HAS_GETADDRINFO 1 +| #define PJ_HAS_SOCKLEN_T 1 +| #define PJ_HAS_SO_ERROR 1 +| #define PJ_EMULATE_RWMUTEX 0 +| /* end confdefs.h. */ +| #include +| int +| main () +| { +| pthread_mutexattr_settype(0,PTHREAD_MUTEX_FAST_NP); +| ; +| return 0; +| } +aconfigure:9699: result: no +aconfigure:9704: checking if pthread_mutexattr_t has recursive member +aconfigure:9723: gcc -c -O2 conftest.c >&5 +conftest.c: In function 'main': +conftest.c:77: error: 'pthread_mutexattr_t' has no member named 'recursive' +aconfigure:9729: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| #define PJ_HAS_NET_IF_H 1 +| #define PJ_OS_NAME "i686-pc-linux-gnu" +| #define PJ_HAS_ERRNO_VAR 1 +| #define PJ_HAS_HIGH_RES_TIMER 1 +| #define PJ_HAS_MALLOC 1 +| #define PJ_NATIVE_STRING_IS_UNICODE 0 +| #define PJ_ATOMIC_VALUE_TYPE long +| #define PJ_SOCK_HAS_INET_ATON 1 +| #define PJ_SOCK_HAS_INET_PTON 1 +| #define PJ_SOCK_HAS_INET_NTOP 1 +| #define PJ_SOCK_HAS_GETADDRINFO 1 +| #define PJ_HAS_SOCKLEN_T 1 +| #define PJ_HAS_SO_ERROR 1 +| #define PJ_EMULATE_RWMUTEX 0 +| /* end confdefs.h. */ +| #include +| int +| main () +| { +| pthread_mutexattr_t attr; +| attr.recursive=1; +| ; +| return 0; +| } +aconfigure:9754: result: no +aconfigure:9760: checking ioqueue backend +aconfigure:9773: result: select() +aconfigure:9820: checking sys/soundcard.h usability +aconfigure:9832: gcc -c -O2 conftest.c >&5 +aconfigure:9838: $? = 0 +aconfigure:9842: test -z + || test ! -s conftest.err +aconfigure:9845: $? = 0 +aconfigure:9848: test -s conftest.o +aconfigure:9851: $? = 0 +aconfigure:9861: result: yes +aconfigure:9865: checking sys/soundcard.h presence +aconfigure:9875: gcc -E conftest.c +aconfigure:9881: $? = 0 +aconfigure:9901: result: yes +aconfigure:9936: checking for sys/soundcard.h +aconfigure:9943: result: yes +aconfigure:9962: checking linux/soundcard.h usability +aconfigure:9974: gcc -c -O2 conftest.c >&5 +aconfigure:9980: $? = 0 +aconfigure:9984: test -z + || test ! -s conftest.err +aconfigure:9987: $? = 0 +aconfigure:9990: test -s conftest.o +aconfigure:9993: $? = 0 +aconfigure:10003: result: yes +aconfigure:10007: checking linux/soundcard.h presence +aconfigure:10017: gcc -E conftest.c +aconfigure:10023: $? = 0 +aconfigure:10043: result: yes +aconfigure:10078: checking for linux/soundcard.h +aconfigure:10085: result: yes +aconfigure:10104: checking machine/soundcard.h usability +aconfigure:10116: gcc -c -O2 conftest.c >&5 +conftest.c:106:31: error: machine/soundcard.h: No such file or directory +aconfigure:10122: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| #define PJ_HAS_NET_IF_H 1 +| #define PJ_OS_NAME "i686-pc-linux-gnu" +| #define PJ_HAS_ERRNO_VAR 1 +| #define PJ_HAS_HIGH_RES_TIMER 1 +| #define PJ_HAS_MALLOC 1 +| #define PJ_NATIVE_STRING_IS_UNICODE 0 +| #define PJ_ATOMIC_VALUE_TYPE long +| #define PJ_SOCK_HAS_INET_ATON 1 +| #define PJ_SOCK_HAS_INET_PTON 1 +| #define PJ_SOCK_HAS_INET_NTOP 1 +| #define PJ_SOCK_HAS_GETADDRINFO 1 +| #define PJ_HAS_SOCKLEN_T 1 +| #define PJ_HAS_SO_ERROR 1 +| #define PJ_EMULATE_RWMUTEX 0 +| /* end confdefs.h. */ +| #include +| #if HAVE_SYS_TYPES_H +| # include +| #endif +| #if HAVE_SYS_STAT_H +| # include +| #endif +| #if STDC_HEADERS +| # include +| # include +| #else +| # if HAVE_STDLIB_H +| # include +| # endif +| #endif +| #if HAVE_STRING_H +| # if !STDC_HEADERS && HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #if HAVE_STRINGS_H +| # include +| #endif +| #if HAVE_INTTYPES_H +| # include +| #else +| # if HAVE_STDINT_H +| # include +| # endif +| #endif +| #if HAVE_UNISTD_H +| # include +| #endif +| #include +aconfigure:10145: result: no +aconfigure:10149: checking machine/soundcard.h presence +aconfigure:10159: gcc -E conftest.c +conftest.c:72:31: error: machine/soundcard.h: No such file or directory +aconfigure:10165: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| #define PJ_HAS_NET_IF_H 1 +| #define PJ_OS_NAME "i686-pc-linux-gnu" +| #define PJ_HAS_ERRNO_VAR 1 +| #define PJ_HAS_HIGH_RES_TIMER 1 +| #define PJ_HAS_MALLOC 1 +| #define PJ_NATIVE_STRING_IS_UNICODE 0 +| #define PJ_ATOMIC_VALUE_TYPE long +| #define PJ_SOCK_HAS_INET_ATON 1 +| #define PJ_SOCK_HAS_INET_PTON 1 +| #define PJ_SOCK_HAS_INET_NTOP 1 +| #define PJ_SOCK_HAS_GETADDRINFO 1 +| #define PJ_HAS_SOCKLEN_T 1 +| #define PJ_HAS_SO_ERROR 1 +| #define PJ_EMULATE_RWMUTEX 0 +| /* end confdefs.h. */ +| #include +aconfigure:10185: result: no +aconfigure:10220: checking for machine/soundcard.h +aconfigure:10227: result: no +aconfigure:10283: checking alsa/version.h usability +aconfigure:10295: gcc -c -O2 conftest.c >&5 +aconfigure:10301: $? = 0 +aconfigure:10305: test -z + || test ! -s conftest.err +aconfigure:10308: $? = 0 +aconfigure:10311: test -s conftest.o +aconfigure:10314: $? = 0 +aconfigure:10324: result: yes +aconfigure:10328: checking alsa/version.h presence +aconfigure:10338: gcc -E conftest.c +aconfigure:10344: $? = 0 +aconfigure:10364: result: yes +aconfigure:10399: checking for alsa/version.h +aconfigure:10406: result: yes +aconfigure:10421: result: Checking sound device backend... unix +aconfigure:10462: result: Checking if small filter is disabled... no +aconfigure:10476: result: Checking if large filter is disabled... no +aconfigure:10490: result: Checking if Speex AEC is disabled...no +aconfigure:10508: result: Checking if G.711 codec is disabled...no +aconfigure:10527: result: Checking if L16 codec is disabled...no +aconfigure:10546: result: Checking if GSM codec is disabled...no +aconfigure:10564: result: Checking if G.722 codec is disabled...no +aconfigure:10582: result: Checking if Speex codec is disabled...no +aconfigure:10600: result: Checking if iLBC codec is disabled...no +aconfigure:10682: result: Skipping libsamplerate detection +aconfigure:10959: result: Skipping Intel IPP settings (not wanted) +aconfigure:10978: result: checking for OpenSSL installations.. +aconfigure:10993: checking openssl/ssl.h usability +aconfigure:11005: gcc -c -O2 conftest.c >&5 +conftest.c:106:25: error: openssl/ssl.h: No such file or directory +aconfigure:11011: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| #define PJ_HAS_NET_IF_H 1 +| #define PJ_OS_NAME "i686-pc-linux-gnu" +| #define PJ_HAS_ERRNO_VAR 1 +| #define PJ_HAS_HIGH_RES_TIMER 1 +| #define PJ_HAS_MALLOC 1 +| #define PJ_NATIVE_STRING_IS_UNICODE 0 +| #define PJ_ATOMIC_VALUE_TYPE long +| #define PJ_SOCK_HAS_INET_ATON 1 +| #define PJ_SOCK_HAS_INET_PTON 1 +| #define PJ_SOCK_HAS_INET_NTOP 1 +| #define PJ_SOCK_HAS_GETADDRINFO 1 +| #define PJ_HAS_SOCKLEN_T 1 +| #define PJ_HAS_SO_ERROR 1 +| #define PJ_EMULATE_RWMUTEX 0 +| /* end confdefs.h. */ +| #include +| #if HAVE_SYS_TYPES_H +| # include +| #endif +| #if HAVE_SYS_STAT_H +| # include +| #endif +| #if STDC_HEADERS +| # include +| # include +| #else +| # if HAVE_STDLIB_H +| # include +| # endif +| #endif +| #if HAVE_STRING_H +| # if !STDC_HEADERS && HAVE_MEMORY_H +| # include +| # endif +| # include +| #endif +| #if HAVE_STRINGS_H +| # include +| #endif +| #if HAVE_INTTYPES_H +| # include +| #else +| # if HAVE_STDINT_H +| # include +| # endif +| #endif +| #if HAVE_UNISTD_H +| # include +| #endif +| #include +aconfigure:11034: result: no +aconfigure:11038: checking openssl/ssl.h presence +aconfigure:11048: gcc -E conftest.c +conftest.c:72:25: error: openssl/ssl.h: No such file or directory +aconfigure:11054: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| #define PJ_HAS_NET_IF_H 1 +| #define PJ_OS_NAME "i686-pc-linux-gnu" +| #define PJ_HAS_ERRNO_VAR 1 +| #define PJ_HAS_HIGH_RES_TIMER 1 +| #define PJ_HAS_MALLOC 1 +| #define PJ_NATIVE_STRING_IS_UNICODE 0 +| #define PJ_ATOMIC_VALUE_TYPE long +| #define PJ_SOCK_HAS_INET_ATON 1 +| #define PJ_SOCK_HAS_INET_PTON 1 +| #define PJ_SOCK_HAS_INET_NTOP 1 +| #define PJ_SOCK_HAS_GETADDRINFO 1 +| #define PJ_HAS_SOCKLEN_T 1 +| #define PJ_HAS_SO_ERROR 1 +| #define PJ_EMULATE_RWMUTEX 0 +| /* end confdefs.h. */ +| #include +aconfigure:11074: result: no +aconfigure:11109: checking for openssl/ssl.h +aconfigure:11116: result: no +aconfigure:11125: checking for SSL_library_init in -lssl +aconfigure:11155: gcc -o conftest -O2 conftest.c -lssl -lm -lnsl -lrt -lpthread -lasound >&5 +/usr/bin/ld: cannot find -lssl +collect2: ld returned 1 exit status +aconfigure:11161: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| #define PJ_HAS_NET_IF_H 1 +| #define PJ_OS_NAME "i686-pc-linux-gnu" +| #define PJ_HAS_ERRNO_VAR 1 +| #define PJ_HAS_HIGH_RES_TIMER 1 +| #define PJ_HAS_MALLOC 1 +| #define PJ_NATIVE_STRING_IS_UNICODE 0 +| #define PJ_ATOMIC_VALUE_TYPE long +| #define PJ_SOCK_HAS_INET_ATON 1 +| #define PJ_SOCK_HAS_INET_PTON 1 +| #define PJ_SOCK_HAS_INET_NTOP 1 +| #define PJ_SOCK_HAS_GETADDRINFO 1 +| #define PJ_HAS_SOCKLEN_T 1 +| #define PJ_HAS_SO_ERROR 1 +| #define PJ_EMULATE_RWMUTEX 0 +| /* end confdefs.h. */ +| +| /* Override any gcc2 internal prototype to avoid an error. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| /* We use char because int might match the return type of a gcc2 +| builtin and then its argument prototype would still apply. */ +| char SSL_library_init (); +| int +| main () +| { +| SSL_library_init (); +| ; +| return 0; +| } +aconfigure:11187: result: no +aconfigure:11193: checking for ERR_load_BIO_strings in -lcrypto +aconfigure:11223: gcc -o conftest -O2 conftest.c -lcrypto -lm -lnsl -lrt -lpthread -lasound >&5 +/usr/bin/ld: cannot find -lcrypto +collect2: ld returned 1 exit status +aconfigure:11229: $? = 1 +aconfigure: failed program was: +| /* confdefs.h. */ +| +| #define PACKAGE_NAME "pjproject" +| #define PACKAGE_TARNAME "pjproject" +| #define PACKAGE_VERSION "1.0" +| #define PACKAGE_STRING "pjproject 1.0" +| #define PACKAGE_BUGREPORT "" +| #ifdef __cplusplus +| extern "C" void exit (int) throw (); +| #endif +| #define HAVE_LIBPTHREAD 1 +| #define HAVE_LIBRT 1 +| #define HAVE_LIBNSL 1 +| #define PJ_M_NAME "i686" +| #define PJ_POOL_ALIGNMENT 4 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| #define STDC_HEADERS 1 +| #define HAVE_SYS_TYPES_H 1 +| #define HAVE_SYS_STAT_H 1 +| #define HAVE_STDLIB_H 1 +| #define HAVE_STRING_H 1 +| #define HAVE_MEMORY_H 1 +| #define HAVE_STRINGS_H 1 +| #define HAVE_INTTYPES_H 1 +| #define HAVE_STDINT_H 1 +| #define HAVE_UNISTD_H 1 +| #define PJ_HAS_ARPA_INET_H 1 +| #define PJ_HAS_ASSERT_H 1 +| #define PJ_HAS_CTYPE_H 1 +| #define PJ_HAS_ERRNO_H 1 +| #define PJ_HAS_FCNTL_H 1 +| #define PJ_HAS_LINUX_SOCKET_H 1 +| #define PJ_HAS_MALLOC_H 1 +| #define PJ_HAS_NETDB_H 1 +| #define PJ_HAS_NETINET_IN_SYSTM_H 1 +| #define PJ_HAS_NETINET_IN_H 1 +| #define PJ_HAS_NETINET_IP_H 1 +| #define PJ_HAS_IFADDRS_H 1 +| #define PJ_HAS_SEMAPHORE_H 1 +| #define PJ_HAS_SETJMP_H 1 +| #define PJ_HAS_STDARG_H 1 +| #define PJ_HAS_STDDEF_H 1 +| #define PJ_HAS_STDIO_H 1 +| #define PJ_HAS_STDINT_H 1 +| #define PJ_HAS_STDLIB_H 1 +| #define PJ_HAS_STRING_H 1 +| #define PJ_HAS_SYS_IOCTL_H 1 +| #define PJ_HAS_SYS_SELECT_H 1 +| #define PJ_HAS_SYS_SOCKET_H 1 +| #define PJ_HAS_SYS_TIME_H 1 +| #define PJ_HAS_SYS_TIMEB_H 1 +| #define PJ_HAS_SYS_TYPES_H 1 +| #define PJ_HAS_TIME_H 1 +| #define PJ_HAS_UNISTD_H 1 +| #define PJ_HAS_NET_IF_H 1 +| #define PJ_OS_NAME "i686-pc-linux-gnu" +| #define PJ_HAS_ERRNO_VAR 1 +| #define PJ_HAS_HIGH_RES_TIMER 1 +| #define PJ_HAS_MALLOC 1 +| #define PJ_NATIVE_STRING_IS_UNICODE 0 +| #define PJ_ATOMIC_VALUE_TYPE long +| #define PJ_SOCK_HAS_INET_ATON 1 +| #define PJ_SOCK_HAS_INET_PTON 1 +| #define PJ_SOCK_HAS_INET_NTOP 1 +| #define PJ_SOCK_HAS_GETADDRINFO 1 +| #define PJ_HAS_SOCKLEN_T 1 +| #define PJ_HAS_SO_ERROR 1 +| #define PJ_EMULATE_RWMUTEX 0 +| /* end confdefs.h. */ +| +| /* Override any gcc2 internal prototype to avoid an error. */ +| #ifdef __cplusplus +| extern "C" +| #endif +| /* We use char because int might match the return type of a gcc2 +| builtin and then its argument prototype would still apply. */ +| char ERR_load_BIO_strings (); +| int +| main () +| { +| ERR_load_BIO_strings (); +| ; +| return 0; +| } +aconfigure:11255: result: no +aconfigure:11269: result: ** OpenSSL libraries not found, disabling SSL support ** +aconfigure:11278: checking if select() needs correct nfds +aconfigure:11292: result: no (default) +aconfigure:11294: result: ** Decided that select() doesn't need correct nfds (please check) +aconfigure:11299: checking if pj_thread_create() should enforce stack size +aconfigure:11313: result: no (default) +aconfigure:11318: checking if pj_thread_create() should allocate stack +aconfigure:11332: result: no (default) +aconfigure:11348: result: ** Setting non-blocking recv() retval to EAGAIN (please check) +aconfigure:11364: result: ** Setting non-blocking connect() retval to EINPROGRESS (please check) +aconfigure:11488: creating ./config.status + +## ---------------------- ## +## Running config.status. ## +## ---------------------- ## + +This file was extended by pjproject config.status 1.0, which was +generated by GNU Autoconf 2.59. Invocation command line was + + CONFIG_FILES = + CONFIG_HEADERS = + CONFIG_LINKS = + CONFIG_COMMANDS = + $ ./config.status + +on sulfur + +config.status:691: creating build.mak +config.status:691: creating build/os-auto.mak +config.status:691: creating pjlib/build/os-auto.mak +config.status:691: creating pjlib-util/build/os-auto.mak +config.status:691: creating pjmedia/build/os-auto.mak +config.status:691: creating pjsip/build/os-auto.mak +config.status:691: creating third_party/build/portaudio/os-auto.mak +config.status:691: creating third_party/build/os-auto.mak +config.status:794: creating pjlib/include/pj/compat/os_auto.h +config.status:1024: pjlib/include/pj/compat/os_auto.h is unchanged +config.status:794: creating pjlib/include/pj/compat/m_auto.h +config.status:1024: pjlib/include/pj/compat/m_auto.h is unchanged +config.status:794: creating pjmedia/include/pjmedia/config_auto.h +config.status:1024: pjmedia/include/pjmedia/config_auto.h is unchanged +config.status:794: creating pjmedia/include/pjmedia-codec/config_auto.h +config.status:1024: pjmedia/include/pjmedia-codec/config_auto.h is unchanged +config.status:794: creating pjsip/include/pjsip/sip_autoconf.h +config.status:1024: pjsip/include/pjsip/sip_autoconf.h is unchanged +aconfigure:12561: result: + +Configurations for current target have been written to 'build.mak', and 'os-auto.mak' in various build directories, and pjlib/include/pj/compat/os_auto.h. + +Further customizations can be put in: + - 'user.mak' + - 'pjlib/include/pj/config_site.h' + +The next step now is to run 'make dep' and 'make'. + + +## ---------------- ## +## Cache variables. ## +## ---------------- ## + +ac_cv_build=i686-pc-linux-gnu +ac_cv_build_alias=i686-pc-linux-gnu +ac_cv_c_bigendian=no +ac_cv_c_compiler_gnu=yes +ac_cv_cxx_compiler_gnu=yes +ac_cv_env_CC_set= +ac_cv_env_CC_value= +ac_cv_env_CFLAGS_set= +ac_cv_env_CFLAGS_value= +ac_cv_env_CPPFLAGS_set= +ac_cv_env_CPPFLAGS_value= +ac_cv_env_CPP_set= +ac_cv_env_CPP_value= +ac_cv_env_CXXFLAGS_set= +ac_cv_env_CXXFLAGS_value= +ac_cv_env_CXX_set= +ac_cv_env_CXX_value= +ac_cv_env_LDFLAGS_set= +ac_cv_env_LDFLAGS_value= +ac_cv_env_build_alias_set= +ac_cv_env_build_alias_value= +ac_cv_env_host_alias_set= +ac_cv_env_host_alias_value= +ac_cv_env_target_alias_set= +ac_cv_env_target_alias_value= +ac_cv_exeext= +ac_cv_header_alsa_version_h=yes +ac_cv_header_arpa_inet_h=yes +ac_cv_header_assert_h=yes +ac_cv_header_ctype_h=yes +ac_cv_header_errno_h=yes +ac_cv_header_fcntl_h=yes +ac_cv_header_ifaddrs_h=yes +ac_cv_header_inttypes_h=yes +ac_cv_header_linux_socket_h=yes +ac_cv_header_linux_soundcard_h=yes +ac_cv_header_machine_soundcard_h=no +ac_cv_header_malloc_h=yes +ac_cv_header_memory_h=yes +ac_cv_header_mswsock_h=no +ac_cv_header_net_if_h=yes +ac_cv_header_netdb_h=yes +ac_cv_header_netinet_in_h=yes +ac_cv_header_netinet_in_systm_h=yes +ac_cv_header_netinet_ip_h=yes +ac_cv_header_openssl_ssl_h=no +ac_cv_header_semaphore_h=yes +ac_cv_header_setjmp_h=yes +ac_cv_header_stdarg_h=yes +ac_cv_header_stdc=yes +ac_cv_header_stddef_h=yes +ac_cv_header_stdint_h=yes +ac_cv_header_stdio_h=yes +ac_cv_header_stdlib_h=yes +ac_cv_header_string_h=yes +ac_cv_header_strings_h=yes +ac_cv_header_sys_ioctl_h=yes +ac_cv_header_sys_select_h=yes +ac_cv_header_sys_socket_h=yes +ac_cv_header_sys_soundcard_h=yes +ac_cv_header_sys_stat_h=yes +ac_cv_header_sys_time_h=yes +ac_cv_header_sys_timeb_h=yes +ac_cv_header_sys_types_h=yes +ac_cv_header_time_h=yes +ac_cv_header_unistd_h=yes +ac_cv_header_uuid_uuid_h=no +ac_cv_header_winsock2_h=no +ac_cv_header_winsock_h=no +ac_cv_header_ws2tcpip_h=no +ac_cv_host=i686-pc-linux-gnu +ac_cv_host_alias=i686-pc-linux-gnu +ac_cv_lib_crypto_ERR_load_BIO_strings=no +ac_cv_lib_m_fmod=yes +ac_cv_lib_nsl_puts=yes +ac_cv_lib_ole32_puts=no +ac_cv_lib_pthread_pthread_create=yes +ac_cv_lib_rt_puts=yes +ac_cv_lib_socket_puts=no +ac_cv_lib_ssl_SSL_library_init=no +ac_cv_lib_uuid_uuid_generate=no +ac_cv_lib_winmm_puts=no +ac_cv_lib_ws2_32_puts=no +ac_cv_lib_wsock32_puts=no +ac_cv_objext=o +ac_cv_prog_CPP='gcc -E' +ac_cv_prog_ac_ct_CC=gcc +ac_cv_prog_ac_ct_CXX=g++ +ac_cv_prog_cc_g=yes +ac_cv_prog_cc_stdc= +ac_cv_prog_cxx_g=yes +ac_cv_prog_egrep='grep -E' +ac_cv_target=i686-pc-linux-gnu +ac_cv_target_alias=i686-pc-linux-gnu + +## ----------------- ## +## Output variables. ## +## ----------------- ## + +CC='gcc' +CFLAGS='-O2' +CPP='gcc -E' +CPPFLAGS='' +CXX='g++' +CXXFLAGS='-O2 ' +DEFS='-DHAVE_CONFIG_H' +ECHO_C='' +ECHO_N='-n' +ECHO_T='' +EGREP='grep -E' +EXEEXT='' +LDFLAGS='' +LIBOBJS='' +LIBS='-lm -lnsl -lrt -lpthread -lasound' +LTLIBOBJS='' +OBJEXT='o' +PACKAGE_BUGREPORT='' +PACKAGE_NAME='pjproject' +PACKAGE_STRING='pjproject 1.0' +PACKAGE_TARNAME='pjproject' +PACKAGE_VERSION='1.0' +PATH_SEPARATOR=':' +SHELL='/bin/bash' +ac_build_mak_vars='' +ac_cross_compile='' +ac_ct_CC='gcc' +ac_ct_CXX='g++' +ac_host='unix' +ac_linux_poll='select' +ac_main_obj='main.o' +ac_no_g711_codec='' +ac_no_g722_codec='' +ac_no_gsm_codec='' +ac_no_ilbc_codec='' +ac_no_l16_codec='' +ac_no_large_filter='' +ac_no_small_filter='' +ac_no_speex_aec='' +ac_no_speex_codec='' +ac_no_ssl='' +ac_os_objs='ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_simple.o' +ac_pa_cflags=' -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN' +ac_pa_use_alsa='1' +ac_pa_use_oss='1' +ac_pjdir='/home-local/manu/dev/sfl/SFLphone/sflphone/libs/pjproject-1.0.1' +ac_pjmedia_snd='pa_unix' +bindir='${exec_prefix}/bin' +build='i686-pc-linux-gnu' +build_alias='' +build_cpu='i686' +build_os='linux-gnu' +build_vendor='pc' +datadir='${prefix}/share' +exec_prefix='${prefix}' +host='i686-pc-linux-gnu' +host_alias='' +host_cpu='i686' +host_os='linux-gnu' +host_vendor='pc' +includedir='${prefix}/include' +infodir='${prefix}/info' +libcrypto_present='' +libdir='${exec_prefix}/lib' +libexecdir='${exec_prefix}/libexec' +libssl_present='' +localstatedir='${prefix}/var' +mandir='${prefix}/man' +oldincludedir='/usr/include' +openssl_h_present='' +prefix='/usr/local' +program_transform_name='s,x,x,' +sbindir='${exec_prefix}/sbin' +sharedstatedir='${prefix}/com' +sysconfdir='${prefix}/etc' +target='i686-pc-linux-gnu' +target_alias='' +target_cpu='i686' +target_os='linux-gnu' +target_vendor='pc' + +## ----------- ## +## confdefs.h. ## +## ----------- ## + +#define HAVE_INTTYPES_H 1 +#define HAVE_LIBM 1 +#define HAVE_LIBNSL 1 +#define HAVE_LIBPTHREAD 1 +#define HAVE_LIBRT 1 +#define HAVE_MEMORY_H 1 +#define HAVE_STDINT_H 1 +#define HAVE_STDLIB_H 1 +#define HAVE_STRINGS_H 1 +#define HAVE_STRING_H 1 +#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_TYPES_H 1 +#define HAVE_UNISTD_H 1 +#define PACKAGE_BUGREPORT "" +#define PACKAGE_NAME "pjproject" +#define PACKAGE_STRING "pjproject 1.0" +#define PACKAGE_TARNAME "pjproject" +#define PACKAGE_VERSION "1.0" +#define PJ_ATOMIC_VALUE_TYPE long +#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS +#define PJ_BLOCKING_ERROR_VAL EAGAIN +#define PJ_EMULATE_RWMUTEX 0 +#define PJ_HAS_ARPA_INET_H 1 +#define PJ_HAS_ASSERT_H 1 +#define PJ_HAS_CTYPE_H 1 +#define PJ_HAS_ERRNO_H 1 +#define PJ_HAS_ERRNO_VAR 1 +#define PJ_HAS_FCNTL_H 1 +#define PJ_HAS_FLOATING_POINT 1 +#define PJ_HAS_HIGH_RES_TIMER 1 +#define PJ_HAS_IFADDRS_H 1 +#define PJ_HAS_LINUX_SOCKET_H 1 +#define PJ_HAS_MALLOC 1 +#define PJ_HAS_MALLOC_H 1 +#define PJ_HAS_NETDB_H 1 +#define PJ_HAS_NETINET_IN_H 1 +#define PJ_HAS_NETINET_IN_SYSTM_H 1 +#define PJ_HAS_NETINET_IP_H 1 +#define PJ_HAS_NET_IF_H 1 +#define PJ_HAS_SEMAPHORE_H 1 +#define PJ_HAS_SETJMP_H 1 +#define PJ_HAS_SOCKLEN_T 1 +#define PJ_HAS_SO_ERROR 1 +#define PJ_HAS_STDARG_H 1 +#define PJ_HAS_STDDEF_H 1 +#define PJ_HAS_STDINT_H 1 +#define PJ_HAS_STDIO_H 1 +#define PJ_HAS_STDLIB_H 1 +#define PJ_HAS_STRING_H 1 +#define PJ_HAS_SYS_IOCTL_H 1 +#define PJ_HAS_SYS_SELECT_H 1 +#define PJ_HAS_SYS_SOCKET_H 1 +#define PJ_HAS_SYS_TIMEB_H 1 +#define PJ_HAS_SYS_TIME_H 1 +#define PJ_HAS_SYS_TYPES_H 1 +#define PJ_HAS_TIME_H 1 +#define PJ_HAS_UNISTD_H 1 +#define PJ_LINUX 1 +#define PJ_M_NAME "i686" +#define PJ_NATIVE_STRING_IS_UNICODE 0 +#define PJ_OS_NAME "i686-pc-linux-gnu" +#define PJ_POOL_ALIGNMENT 4 +#define PJ_SELECT_NEEDS_NFDS 0 +#define PJ_SOCK_HAS_GETADDRINFO 1 +#define PJ_SOCK_HAS_INET_ATON 1 +#define PJ_SOCK_HAS_INET_NTOP 1 +#define PJ_SOCK_HAS_INET_PTON 1 +#define PJ_THREAD_ALLOCATE_STACK 0 +#define PJ_THREAD_SET_STACK_SIZE 0 +#define STDC_HEADERS 1 +#endif +#ifdef __cplusplus +extern "C" void exit (int) throw (); + +aconfigure: exit 0 diff --git a/libs/pjproject-1.0.1/config.status b/libs/pjproject-1.0.1/config.status new file mode 100755 index 0000000000000000000000000000000000000000..72fdbe8700487dcb605a2956299d96d32bbf81b1 --- /dev/null +++ b/libs/pjproject-1.0.1/config.status @@ -0,0 +1,1073 @@ +#! /bin/bash +# Generated by aconfigure. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false +SHELL=${CONFIG_SHELL-/bin/bash} +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi +DUALCASE=1; export DUALCASE # for MKS sh + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + + +# PATH needs CR, and LINENO needs CR and PATH. +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac + +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links + as_ln_s='cp -p' + else + as_ln_s='ln -s' + fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.file + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +as_executable_p="test -f" + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH + +exec 6>&1 + +# Open the log real soon, to keep \$[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + +This file was extended by pjproject $as_me 1.0, which was +generated by GNU Autoconf 2.59. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 +config_files=" build.mak build/os-auto.mak pjlib/build/os-auto.mak pjlib-util/build/os-auto.mak pjmedia/build/os-auto.mak pjsip/build/os-auto.mak third_party/build/portaudio/os-auto.mak third_party/build/os-auto.mak" +config_headers=" pjlib/include/pj/compat/os_auto.h pjlib/include/pj/compat/m_auto.h pjmedia/include/pjmedia/config_auto.h pjmedia/include/pjmedia-codec/config_auto.h pjsip/include/pjsip/sip_autoconf.h" + +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. + +Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Report bugs to ." +ac_cs_version="\ +pjproject config.status 1.0 +configured by ./aconfigure, generated by GNU Autoconf 2.59, + with options \"\" + +Copyright (C) 2003 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." +srcdir=. +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=*) + ac_option=`expr "x$1" : 'x\([^=]*\)='` + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` + ac_shift=: + ;; + -*) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + *) # This is not an option, so the user has probably given explicit + # arguments. + ac_option=$1 + ac_need_defaults=false;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header + { { echo "$as_me:$LINENO: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit 0 ;; + --debug | --d* | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + ac_need_defaults=false;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; } ;; + + *) ac_config_targets="$ac_config_targets $1" ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +if $ac_cs_recheck; then + echo "running /bin/bash ./aconfigure " $ac_configure_extra_args " --no-create --no-recursion" >&6 + exec /bin/bash ./aconfigure $ac_configure_extra_args --no-create --no-recursion +fi + +for ac_config_target in $ac_config_targets +do + case "$ac_config_target" in + # Handling of arguments. + "build.mak" ) CONFIG_FILES="$CONFIG_FILES build.mak" ;; + "build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES build/os-auto.mak" ;; + "pjlib/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjlib/build/os-auto.mak" ;; + "pjlib-util/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjlib-util/build/os-auto.mak" ;; + "pjmedia/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjmedia/build/os-auto.mak" ;; + "pjsip/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES pjsip/build/os-auto.mak" ;; + "third_party/build/portaudio/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES third_party/build/portaudio/os-auto.mak" ;; + "third_party/build/os-auto.mak" ) CONFIG_FILES="$CONFIG_FILES third_party/build/os-auto.mak" ;; + "pjlib/include/pj/compat/os_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/os_auto.h" ;; + "pjlib/include/pj/compat/m_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjlib/include/pj/compat/m_auto.h" ;; + "pjmedia/include/pjmedia/config_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjmedia/include/pjmedia/config_auto.h" ;; + "pjmedia/include/pjmedia-codec/config_auto.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjmedia/include/pjmedia-codec/config_auto.h" ;; + "pjsip/include/pjsip/sip_autoconf.h" ) CONFIG_HEADERS="$CONFIG_HEADERS pjsip/include/pjsip/sip_autoconf.h" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +done + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason to put it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Create a temporary directory, and hook for its removal unless debugging. +$debug || +{ + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} + +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=./confstat$$-$RANDOM + (umask 077 && mkdir $tmp) +} || +{ + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } +} + + +# +# CONFIG_FILES section. +# + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "$CONFIG_FILES"; then + # Protect against being on the right side of a sed subst in config.status. + sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g; + s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF +s,@SHELL@,/bin/bash,;t t +s,@PATH_SEPARATOR@,:,;t t +s,@PACKAGE_NAME@,pjproject,;t t +s,@PACKAGE_TARNAME@,pjproject,;t t +s,@PACKAGE_VERSION@,1.0,;t t +s,@PACKAGE_STRING@,pjproject 1.0,;t t +s,@PACKAGE_BUGREPORT@,,;t t +s,@exec_prefix@,${prefix},;t t +s,@prefix@,/usr/local,;t t +s,@program_transform_name@,s,x,x,,;t t +s,@bindir@,${exec_prefix}/bin,;t t +s,@sbindir@,${exec_prefix}/sbin,;t t +s,@libexecdir@,${exec_prefix}/libexec,;t t +s,@datadir@,${prefix}/share,;t t +s,@sysconfdir@,${prefix}/etc,;t t +s,@sharedstatedir@,${prefix}/com,;t t +s,@localstatedir@,${prefix}/var,;t t +s,@libdir@,${exec_prefix}/lib,;t t +s,@includedir@,${prefix}/include,;t t +s,@oldincludedir@,/usr/include,;t t +s,@infodir@,${prefix}/info,;t t +s,@mandir@,${prefix}/man,;t t +s,@build_alias@,,;t t +s,@host_alias@,,;t t +s,@target_alias@,,;t t +s,@DEFS@,-DHAVE_CONFIG_H,;t t +s,@ECHO_C@,,;t t +s,@ECHO_N@,-n,;t t +s,@ECHO_T@,,;t t +s,@LIBS@,-lm -lnsl -lrt -lpthread -lasound,;t t +s,@build@,i686-pc-linux-gnu,;t t +s,@build_cpu@,i686,;t t +s,@build_vendor@,pc,;t t +s,@build_os@,linux-gnu,;t t +s,@host@,i686-pc-linux-gnu,;t t +s,@host_cpu@,i686,;t t +s,@host_vendor@,pc,;t t +s,@host_os@,linux-gnu,;t t +s,@target@,i686-pc-linux-gnu,;t t +s,@target_cpu@,i686,;t t +s,@target_vendor@,pc,;t t +s,@target_os@,linux-gnu,;t t +s,@CC@,gcc,;t t +s,@CFLAGS@,-O2,;t t +s,@LDFLAGS@,,;t t +s,@CPPFLAGS@,,;t t +s,@ac_ct_CC@,gcc,;t t +s,@EXEEXT@,,;t t +s,@OBJEXT@,o,;t t +s,@CXX@,g++,;t t +s,@CXXFLAGS@,-O2 ,;t t +s,@ac_ct_CXX@,g++,;t t +s,@ac_pjdir@,/home-local/manu/dev/sfl/SFLphone/sflphone/libs/pjproject-1.0.1,;t t +s,@ac_build_mak_vars@,,;t t +s,@CPP@,gcc -E,;t t +s,@EGREP@,grep -E,;t t +s,@ac_os_objs@,ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_simple.o,;t t +s,@ac_pjmedia_snd@,pa_unix,;t t +s,@ac_pa_cflags@, -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN,;t t +s,@ac_pa_use_alsa@,1,;t t +s,@ac_pa_use_oss@,1,;t t +s,@ac_no_small_filter@,,;t t +s,@ac_no_large_filter@,,;t t +s,@ac_no_speex_aec@,,;t t +s,@ac_no_g711_codec@,,;t t +s,@ac_no_l16_codec@,,;t t +s,@ac_no_gsm_codec@,,;t t +s,@ac_no_g722_codec@,,;t t +s,@ac_no_speex_codec@,,;t t +s,@ac_no_ilbc_codec@,,;t t +s,@ac_no_ssl@,,;t t +s,@openssl_h_present@,,;t t +s,@libssl_present@,,;t t +s,@libcrypto_present@,,;t t +s,@ac_cross_compile@,,;t t +s,@ac_linux_poll@,select,;t t +s,@ac_host@,unix,;t t +s,@ac_main_obj@,main.o,;t t +s,@LIBOBJS@,,;t t +s,@LTLIBOBJS@,,;t t +CEOF + + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_lines=48 + ac_sed_frag=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_lines # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds= + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + else + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + fi + if test ! -s $tmp/subs.frag; then + ac_more_lines=false + else + # The purpose of the label and of the branching condition is to + # speed up the sed processing (if there are no `@' at all, there + # is no need to browse any of the substitutions). + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_lines` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat + fi +fi # test -n "$CONFIG_FILES" + +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; + esac + + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + ac_builddir=. + +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi + +case $srcdir in + .) # No --srcdir option. We are building in place. + ac_srcdir=. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac + + + + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo "$f";; + *) # Relative + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + sed "/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/; +s/:*\${srcdir}:*/:/; +s/:*@srcdir@:*/:/; +s/^\([^=]*=[ ]*\):*/\1/; +s/:*$//; +s/^[^=]*=[ ]*$//; +} + +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s,@configure_input@,$configure_input,;t t +s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t +s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out + rm -f $tmp/stdin + if test x"$ac_file" != x-; then + mv $tmp/out $ac_file + else + cat $tmp/out + rm -f $tmp/out + fi + +done + +# +# CONFIG_HEADER section. +# + +# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where +# NAME is the cpp macro being defined and VALUE is the value it is being given. +# +# ac_d sets the value in "#define NAME VALUE" lines. +ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' +ac_dB='[ ].*$,\1#\2' +ac_dC=' ' +ac_dD=',;t' +# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". +ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' +ac_uB='$,\1#\2define\3' +ac_uC=' ' +ac_uD=',;t' + +for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; + esac + + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + # Do quote $f, to prevent DOS paths from being IFS'd. + echo "$f";; + *) # Relative + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } + # Remove the trailing spaces. + sed 's/[ ]*$//' $ac_file_inputs >$tmp/in + + # Handle all the #define templates only if necessary. + if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then + # If there are no defines, we may have an empty if/fi + : + cat >$tmp/defines.sed <$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in + + cat >$tmp/defines.sed <$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in + + fi # grep + + # Handle all the #undef templates + cat >$tmp/undefs.sed <$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in + + cat >$tmp/undefs.sed <$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + echo "/* Generated by configure. */" >$tmp/config.h + else + echo "/* $ac_file. Generated by configure. */" >$tmp/config.h + fi + cat $tmp/in >>$tmp/config.h + rm -f $tmp/in + if test x"$ac_file" != x-; then + if diff $ac_file $tmp/config.h >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + + rm -f $ac_file + mv $tmp/config.h $ac_file + fi + else + cat $tmp/config.h + rm -f $tmp/config.h + fi +done + +{ (exit 0); exit 0; } diff --git a/libs/pjproject-1.0/config.sub b/libs/pjproject-1.0.1/config.sub similarity index 100% rename from libs/pjproject-1.0/config.sub rename to libs/pjproject-1.0.1/config.sub diff --git a/libs/pjproject-1.0/configure b/libs/pjproject-1.0.1/configure similarity index 100% rename from libs/pjproject-1.0/configure rename to libs/pjproject-1.0.1/configure diff --git a/libs/pjproject-1.0/configure-legacy b/libs/pjproject-1.0.1/configure-legacy similarity index 100% rename from libs/pjproject-1.0/configure-legacy rename to libs/pjproject-1.0.1/configure-legacy diff --git a/libs/pjproject-1.0/install-sh b/libs/pjproject-1.0.1/install-sh similarity index 100% rename from libs/pjproject-1.0/install-sh rename to libs/pjproject-1.0.1/install-sh diff --git a/libs/pjproject-1.0/libpj-sfl.pc.in b/libs/pjproject-1.0.1/libpj-sfl.pc.in similarity index 100% rename from libs/pjproject-1.0/libpj-sfl.pc.in rename to libs/pjproject-1.0.1/libpj-sfl.pc.in diff --git a/libs/pjproject-1.0.1/pjlib-util/build/os-auto.mak b/libs/pjproject-1.0.1/pjlib-util/build/os-auto.mak new file mode 100644 index 0000000000000000000000000000000000000000..fe7975b64497ac781be78cb52d8fcbd9cb2a9842 --- /dev/null +++ b/libs/pjproject-1.0.1/pjlib-util/build/os-auto.mak @@ -0,0 +1,3 @@ +# pjlib-util/build/os-auto.mak. Generated from os-auto.mak.in by configure. +export UTIL_TEST_OBJS = main.o + diff --git a/libs/pjproject-1.0/pjlib-util/build/os-auto.mak.in b/libs/pjproject-1.0.1/pjlib-util/build/os-auto.mak.in similarity index 100% rename from libs/pjproject-1.0/pjlib-util/build/os-auto.mak.in rename to libs/pjproject-1.0.1/pjlib-util/build/os-auto.mak.in diff --git a/libs/pjproject-1.0/pjlib-util/build/os-rtems.mak b/libs/pjproject-1.0.1/pjlib-util/build/os-rtems.mak similarity index 100% rename from libs/pjproject-1.0/pjlib-util/build/os-rtems.mak rename to libs/pjproject-1.0.1/pjlib-util/build/os-rtems.mak diff --git a/libs/pjproject-1.0/pjlib-util/build/pjlib_util.dsp b/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.dsp similarity index 100% rename from libs/pjproject-1.0/pjlib-util/build/pjlib_util.dsp rename to libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.dsp diff --git a/libs/pjproject-1.0/pjlib-util/build/pjlib_util.dsw b/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.dsw similarity index 100% rename from libs/pjproject-1.0/pjlib-util/build/pjlib_util.dsw rename to libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.dsw diff --git a/libs/pjproject-1.0/pjlib-util/build/pjlib_util.vcproj b/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.vcproj similarity index 100% rename from libs/pjproject-1.0/pjlib-util/build/pjlib_util.vcproj rename to libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.vcproj diff --git a/libs/pjproject-1.0/pjlib-util/build/pjlib_util_test.dsp b/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util_test.dsp similarity index 100% rename from libs/pjproject-1.0/pjlib-util/build/pjlib_util_test.dsp rename to libs/pjproject-1.0.1/pjlib-util/build/pjlib_util_test.dsp diff --git a/libs/pjproject-1.0/pjlib-util/build/pjlib_util_test.vcproj b/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util_test.vcproj similarity index 100% rename from libs/pjproject-1.0/pjlib-util/build/pjlib_util_test.vcproj rename to libs/pjproject-1.0.1/pjlib-util/build/pjlib_util_test.vcproj diff --git a/libs/pjproject-1.0/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp b/libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp rename to libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp diff --git a/libs/pjproject-1.0/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp b/libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp rename to libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp diff --git a/libs/pjproject-1.0/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw b/libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw similarity index 100% rename from libs/pjproject-1.0/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw rename to libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw diff --git a/libs/pjproject-1.0/pjlib-util/docs/doxygen.cfg b/libs/pjproject-1.0.1/pjlib-util/docs/doxygen.cfg similarity index 100% rename from libs/pjproject-1.0/pjlib-util/docs/doxygen.cfg rename to libs/pjproject-1.0.1/pjlib-util/docs/doxygen.cfg diff --git a/libs/pjproject-1.0/pjlib-util/docs/doxygen.css b/libs/pjproject-1.0.1/pjlib-util/docs/doxygen.css similarity index 100% rename from libs/pjproject-1.0/pjlib-util/docs/doxygen.css rename to libs/pjproject-1.0.1/pjlib-util/docs/doxygen.css diff --git a/libs/pjproject-1.0/pjlib-util/docs/footer.html b/libs/pjproject-1.0.1/pjlib-util/docs/footer.html similarity index 83% rename from libs/pjproject-1.0/pjlib-util/docs/footer.html rename to libs/pjproject-1.0.1/pjlib-util/docs/footer.html index e888b35767688d010fdd66c43e9f6a420e8e18ee..cfd6d61572c9a410a324d4c8c17c486397e0a32a 100644 --- a/libs/pjproject-1.0/pjlib-util/docs/footer.html +++ b/libs/pjproject-1.0.1/pjlib-util/docs/footer.html @@ -1,7 +1,7 @@

 

PJLIB-UTIL Open Source, small footprint, and portable asynchronous/caching DNS resolver, text scanner, STUN client, and XML library
-(C)2001-2008 Benny Prijono +Copyright (C) 2006-2009 Teluu Inc.
diff --git a/libs/pjproject-1.0/pjlib-util/docs/header.html b/libs/pjproject-1.0.1/pjlib-util/docs/header.html similarity index 100% rename from libs/pjproject-1.0/pjlib-util/docs/header.html rename to libs/pjproject-1.0.1/pjlib-util/docs/header.html diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util.h similarity index 89% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util.h index 1d2acbd748303848e48271aaff5afaca7cccfece..d8523abc1a9e5aebaf313c9fb11388cefd90a8ff 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util.h @@ -1,6 +1,7 @@ -/* $Id: pjlib-util.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pjlib-util.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/base64.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/base64.h similarity index 95% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/base64.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/base64.h index 536add4f532773ca4a2e0a3247cf9267a2327cfc..d2339a567182d42598f622de507dfb8fffad09d5 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/base64.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/base64.h @@ -1,5 +1,6 @@ -/* $Id: base64.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: base64.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/config.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/config.h similarity index 98% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/config.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/config.h index 42fde997c98bdca69a90322321fce54d8bc5c3da..f1e5b1e9937d7317795ef6342d8fed0efea112aa 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/config.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/config.h @@ -1,5 +1,6 @@ -/* $Id: config.h 2124 2008-07-12 09:50:48Z bennylp $ */ +/* $Id: config.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/crc32.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/crc32.h similarity index 95% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/crc32.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/crc32.h index 7cc3801d08e2ff66da0cfbc69b6a3d4bb5e69b97..d63db872c47fc9d0c8f723b3d7823b99621c1a60 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/crc32.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/crc32.h @@ -1,5 +1,6 @@ -/* $Id: crc32.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: crc32.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/dns.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/dns.h similarity index 99% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/dns.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/dns.h index f473c6db4c414869228883c2cec67aa3d21f4dcd..3aba6258f0b716e043235635ef111e9060159f4e 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/dns.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/dns.h @@ -1,5 +1,6 @@ -/* $Id: dns.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: dns.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/dns_server.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/dns_server.h similarity index 96% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/dns_server.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/dns_server.h index 6cadb5ec8e18fa2972f91649b4c4991822ee3651..0dbe531177f7169aa43e16a8d5d4d98b64be8f39 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/dns_server.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/dns_server.h @@ -1,5 +1,6 @@ -/* $Id: dns_server.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: dns_server.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/errno.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/errno.h similarity index 98% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/errno.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/errno.h index 470dc8c871d839909713f9419fb609d24f2154b7..11375c78f42a4ad6168bec95027811cfd023c928 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/errno.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/errno.h @@ -1,6 +1,7 @@ -/* $Id: errno.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: errno.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/getopt.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/getopt.h similarity index 100% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/getopt.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/getopt.h diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/hmac_md5.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/hmac_md5.h similarity index 96% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/hmac_md5.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/hmac_md5.h index e7daef907dd878070acaf3b762f67f13e90bd0d4..a5e36fc465431cc54f892fec7591a0eaf3a856f5 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/hmac_md5.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/hmac_md5.h @@ -1,5 +1,6 @@ -/* $Id: hmac_md5.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: hmac_md5.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/hmac_sha1.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/hmac_sha1.h similarity index 96% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/hmac_sha1.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/hmac_sha1.h index 7a2f474be94706888962e083cd7b8440d9a49eac..5300eea0415f962448843052c8a4742afe479985 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/hmac_sha1.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/hmac_sha1.h @@ -1,5 +1,6 @@ -/* $Id: hmac_sha1.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: hmac_sha1.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/md5.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/md5.h similarity index 94% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/md5.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/md5.h index ed5f63c0260a444be89f29f54439f84ecfa1b40f..5fd90c0a2627f294440c9a07c247cfbb1965d051 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/md5.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/md5.h @@ -1,5 +1,6 @@ -/* $Id: md5.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: md5.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/pcap.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/pcap.h similarity index 96% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/pcap.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/pcap.h index 92c7cabd5fb87cbb55479f84481ae45df465e21c..fb0a3252c20368bc7496142a7c4ea95ef9fc40ae 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/pcap.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/pcap.h @@ -1,6 +1,7 @@ -/* $Id: pcap.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pcap.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/resolver.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/resolver.h similarity index 99% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/resolver.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/resolver.h index 200bc4da2292c433379fdaa3bb4e70350bb1e7dc..2a82b2bc64024145a0a3cc1a88680caf7d388199 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/resolver.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/resolver.h @@ -1,5 +1,6 @@ -/* $Id: resolver.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: resolver.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/scanner.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner.h similarity index 99% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/scanner.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner.h index c0245f056a3f863450c8c0783e76ed2a95beb71d..ef428523b996a5bacddda8fb6238575c19e93dd4 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/scanner.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner.h @@ -1,5 +1,6 @@ -/* $Id: scanner.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: scanner.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h similarity index 95% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h index 8ec0d63f4436faa7af3a98199c616b1a5c731bca..8f6a3ce6074ae2ad28edea3e8455b92c3d8277e4 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h @@ -1,5 +1,6 @@ -/* $Id: scanner_cis_bitwise.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: scanner_cis_bitwise.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/scanner_cis_uint.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner_cis_uint.h similarity index 95% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/scanner_cis_uint.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner_cis_uint.h index 4cf0d4fb612015b381ab71eaea7748d71a47cb76..1a2532ebad85bb9d41934cd5115ee140dde1793a 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/scanner_cis_uint.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner_cis_uint.h @@ -1,5 +1,6 @@ -/* $Id: scanner_cis_uint.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: scanner_cis_uint.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/sha1.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/sha1.h similarity index 94% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/sha1.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/sha1.h index 0b14d770b443c62a5ff3dd2fb61076da6fd7e016..93a2a286cf1d9bb3e24ffd6ec68bf6df49a61b59 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/sha1.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/sha1.h @@ -1,5 +1,6 @@ -/* $Id: sha1.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sha1.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/srv_resolver.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/srv_resolver.h similarity index 90% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/srv_resolver.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/srv_resolver.h index 2395e7c892badd750df239a903bc8f304a0992d4..216e91b9e5d525d9807b1d26cd4896b639fba186 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/srv_resolver.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/srv_resolver.h @@ -1,5 +1,6 @@ -/* $Id: srv_resolver.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: srv_resolver.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -137,6 +138,9 @@ typedef struct pj_dns_srv_record } pj_dns_srv_record; +/** Opaque declaration for DNS SRV query */ +typedef struct pj_dns_srv_async_query pj_dns_srv_async_query; + /** * Type of callback function to receive notification from the resolver * when the resolution process completes. @@ -184,7 +188,20 @@ PJ_DECL(pj_status_t) pj_dns_srv_resolve(const pj_str_t *domain_name, unsigned option, void *token, pj_dns_srv_resolver_cb *cb, - pj_dns_async_query **p_query); + pj_dns_srv_async_query **p_query); + + +/** + * Cancel an outstanding DNS SRV query. + * + * @param query The pending asynchronous query to be cancelled. + * @param notify If non-zero, the callback will be called with failure + * status to notify that the query has been cancelled. + * + * @return PJ_SUCCESS on success, or the appropriate error code, + */ +PJ_DECL(pj_status_t) pj_dns_srv_cancel_query(pj_dns_srv_async_query *query, + pj_bool_t notify); /** diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/string.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/string.h similarity index 94% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/string.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/string.h index b9c28f12a1f78b50e5ce6ce23e8bb7163a4cc0fe..20bac690932f62a182ff8170e11e44d9f9791433 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/string.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/string.h @@ -1,6 +1,7 @@ -/* $Id: string.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: string.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/stun_simple.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/stun_simple.h similarity index 98% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/stun_simple.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/stun_simple.h index 9e663007f64a5e49df9ac3beaceb30c9378e8e92..f95bb3f33595e9676ec6c6102775b12e72232b20 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/stun_simple.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/stun_simple.h @@ -1,5 +1,6 @@ -/* $Id: stun_simple.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: stun_simple.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/types.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/types.h similarity index 93% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/types.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/types.h index b2fb7a097768464174b584a3f15310c6b77f4759..1147e251dc889c3a7fa88932a1bbadcaf43cd27b 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/types.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/types.h @@ -1,5 +1,6 @@ -/* $Id: types.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: types.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/xml.h b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/xml.h similarity index 98% rename from libs/pjproject-1.0/pjlib-util/include/pjlib-util/xml.h rename to libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/xml.h index e05774a011abc519378f86eb088f73c0d3d75567..093ec09dcf7605d28f2868892fe82d3d58194795 100644 --- a/libs/pjproject-1.0/pjlib-util/include/pjlib-util/xml.h +++ b/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/xml.h @@ -1,5 +1,6 @@ -/* $Id: xml.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: xml.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/encryption.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/encryption.c similarity index 99% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/encryption.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/encryption.c index 1a9ee69ea5f46de13047cf2deda9f8906772f455..50fd1dd296027c71c206a3b5bebde5e2796e5555 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/encryption.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/encryption.c @@ -1,5 +1,6 @@ -/* $Id: encryption.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: encryption.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/main.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main.c similarity index 95% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/main.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main.c index 9e68147513d38856c3c665714787d9e46bc19df3..ee025496d90403f15937b87177314773ca104ce7 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/main.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main.c @@ -1,5 +1,6 @@ /* $Id$ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/main_rtems.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main_rtems.c similarity index 100% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/main_rtems.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main_rtems.c diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/main_win32.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main_win32.c similarity index 100% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/main_win32.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main_win32.c diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/resolver_test.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/resolver_test.c similarity index 99% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/resolver_test.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/resolver_test.c index b8713fb3db3f3d2a1418f37d36e1e78dbc33a731..a65878ffa8031864e5c51f42b98057acbc0732f5 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/resolver_test.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/resolver_test.c @@ -1,5 +1,6 @@ -/* $Id: resolver_test.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: resolver_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -412,9 +413,9 @@ static int init(void) int i; nameservers[0] = pj_str("127.0.0.1"); - ports[0] = 553; + ports[0] = 5553; nameservers[1] = pj_str("127.0.0.1"); - ports[1] = 554; + ports[1] = 5554; g_server[0].port = ports[0]; g_server[1].port = ports[1]; @@ -1367,6 +1368,8 @@ int resolver_test(void) #endif rc = init(); + if (rc != 0) + goto on_error; rc = a_parser_test(); if (rc != 0) diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/stun.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/stun.c similarity index 96% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/stun.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/stun.c index 4dc5f3e3ca8fec8465438f412a02ab1f6094624d..66ebcaa44b59148b50a173b0db61bc85ba559354 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/stun.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/stun.c @@ -1,5 +1,6 @@ -/* $Id: stun.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: stun.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/test.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/test.c similarity index 97% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/test.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/test.c index 832d9173f8f462f8e435bbe378614970c2e47e8a..076ded197a0a52704760bd5291a4501a4596b789 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/test.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/test.c @@ -1,5 +1,6 @@ /* $Id$ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/test.h b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/test.h similarity index 95% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/test.h rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/test.h index 6771b26e7f1fdd779f7654d2e07a47018a0ca3e1..78a9aa15af8b6b382f7bc157e51f9475199ff8f2 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/test.h +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/test.h @@ -1,5 +1,6 @@ /* $Id$ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/xml.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/xml.c similarity index 97% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/xml.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/xml.c index b6738beb2f4d10d1c504a22d03b22b794af8f35d..ee2ce52525ada2fcb065fcad5fc4d8c6ba466d5a 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util-test/xml.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/xml.c @@ -1,5 +1,6 @@ -/* $Id: xml.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: xml.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/base64.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/base64.c similarity index 97% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/base64.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/base64.c index 606585c4596d5c62aac982053b35996e7b75dac3..424fd83edc4402e4fb30267e3060a94de20051a2 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/base64.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/base64.c @@ -1,5 +1,6 @@ -/* $Id: base64.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: base64.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/crc32.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/crc32.c similarity index 100% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/crc32.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/crc32.c diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/dns.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns.c similarity index 99% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/dns.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns.c index 973fe73fea56010596072275922facca35a82d47..de16a0e93468190da006327635b57391139773b9 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/dns.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns.c @@ -1,5 +1,6 @@ -/* $Id: dns.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: dns.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/dns_dump.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns_dump.c similarity index 97% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/dns_dump.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns_dump.c index 2dcf340d05a907c697b52f4886806c49e52ddbc1..82a39074da8d7dae6ba314e8e6350380bce4e4ce 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/dns_dump.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns_dump.c @@ -1,5 +1,6 @@ -/* $Id: dns_dump.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: dns_dump.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/dns_server.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns_server.c similarity index 99% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/dns_server.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns_server.c index a5c5550dfd02ac79a23dbddda3e07dae2ddda988..c4f3eda2beae6caa80c13cd2ee666bbf2044caa5 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/dns_server.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns_server.c @@ -1,5 +1,6 @@ -/* $Id: dns_server.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: dns_server.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/errno.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/errno.c similarity index 98% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/errno.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/errno.c index c2144bcb72c8f03ef8c3662697ab04ed61e036f1..bf685bc7c59aa5617efc800daf26aef7e71f9741 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/errno.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/errno.c @@ -1,5 +1,6 @@ -/* $Id: errno.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: errno.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/getopt.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/getopt.c similarity index 99% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/getopt.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/getopt.c index dfec196c6451bc4ad3e20ea0f1b33b2bf103cda7..0f8aca4d57fd1c35a5dcbe3ba8a8f867a0abda4f 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/getopt.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/getopt.c @@ -1,5 +1,6 @@ -/* $Id: getopt.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: getopt.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -22,7 +23,7 @@ * * modified by Mike Borella * - * $Id: getopt.c 2039 2008-06-20 22:44:47Z bennylp $ + * $Id: getopt.c 2394 2008-12-23 17:27:53Z bennylp $ */ #include diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/hmac_md5.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/hmac_md5.c similarity index 95% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/hmac_md5.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/hmac_md5.c index baff3f95ca7d94289ec11bd666aa0af554b0b1e1..95a212ad1b0c3096cec115c513c45d6e8e8e9895 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/hmac_md5.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/hmac_md5.c @@ -1,5 +1,6 @@ -/* $Id: hmac_md5.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: hmac_md5.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/hmac_sha1.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/hmac_sha1.c similarity index 95% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/hmac_sha1.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/hmac_sha1.c index a24312f82ef6a0c1af70a348954f5dbfde701b48..423faa8ade21e03663e5ebf69c8290f67d4d7202 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/hmac_sha1.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/hmac_sha1.c @@ -1,5 +1,6 @@ -/* $Id: hmac_sha1.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: hmac_sha1.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/md5.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/md5.c similarity index 100% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/md5.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/md5.c diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/pcap.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/pcap.c similarity index 98% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/pcap.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/pcap.c index f522af3a2249e004ab18bc91026713695ae08f4e..69a772182ee3c934e106f8a7806cc6a341d8d608 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/pcap.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/pcap.c @@ -1,6 +1,7 @@ -/* $Id: pcap.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pcap.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/resolver.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/resolver.c similarity index 99% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/resolver.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/resolver.c index 1c14cd9cd3e09751cb3a5d313b16e1a712b6aae2..991c9913135164e089b5ce293a3c05e32a1d6adf 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/resolver.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/resolver.c @@ -1,5 +1,6 @@ -/* $Id: resolver.c 2124 2008-07-12 09:50:48Z bennylp $ */ +/* $Id: resolver.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/scanner.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner.c similarity index 99% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/scanner.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner.c index 93e38e451f96ccd9210104a5a63687ec32e3375b..d53f6dc35ba4557740ac937f6ad8e0f14b355904 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/scanner.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner.c @@ -1,5 +1,6 @@ -/* $Id: scanner.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: scanner.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c similarity index 93% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c index ea8e30b203e1706e0604b8fceeec8dfdc04e1bca..6387541d2f03c30ae77bdbbe35f1c2728c99c8c6 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c @@ -1,5 +1,6 @@ -/* $Id: scanner_cis_bitwise.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: scanner_cis_bitwise.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/scanner_cis_uint.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner_cis_uint.c similarity index 91% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/scanner_cis_uint.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner_cis_uint.c index 3fc52aeee3b3237321b0394b6a3c0b71275abb2b..5db0e77c83785ce6a3166bddf2921da03630889d 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/scanner_cis_uint.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner_cis_uint.c @@ -1,5 +1,6 @@ -/* $Id: scanner_cis_uint.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: scanner_cis_uint.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/sha1.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/sha1.c similarity index 100% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/sha1.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/sha1.c diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/srv_resolver.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/srv_resolver.c similarity index 88% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/srv_resolver.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/srv_resolver.c index 4da85247b806a5ddac82ecdcd4fda35091d767a8..83963495574d53a1b9cfdaa596d02629eda89e1d 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/srv_resolver.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/srv_resolver.c @@ -1,5 +1,6 @@ -/* $Id: srv_resolver.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: srv_resolver.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -21,6 +22,7 @@ #include #include #include +#include #include #include #include @@ -30,9 +32,17 @@ #define ADDR_MAX_COUNT PJ_DNS_MAX_IP_IN_A_REC +struct common +{ + pj_dns_type type; /**< Type of this structure.*/ +}; + struct srv_target { + struct common common; + pj_dns_srv_async_query *parent; pj_str_t target_name; + pj_dns_async_query *q_a; char target_buf[PJ_MAX_HOSTNAME]; pj_str_t cname; char cname_buf[PJ_MAX_HOSTNAME]; @@ -44,13 +54,15 @@ struct srv_target pj_in_addr addr[ADDR_MAX_COUNT]; }; -typedef struct pj_dns_srv_resolver_job +struct pj_dns_srv_async_query { + struct common common; char *objname; - pj_dns_resolver *resolver; /**< Resolver SIP instance. */ pj_dns_type dns_state; /**< DNS type being resolved. */ + pj_dns_resolver *resolver; /**< Resolver SIP instance. */ void *token; + pj_dns_async_query *q_srv; pj_dns_srv_resolver_cb *cb; pj_status_t last_error; @@ -67,7 +79,7 @@ typedef struct pj_dns_srv_resolver_job /* Number of hosts in SRV records that the IP address has been resolved */ unsigned host_resolved; -} pj_dns_srv_resolver_job; +}; /* Async resolver callback, forward decl. */ @@ -88,11 +100,11 @@ PJ_DEF(pj_status_t) pj_dns_srv_resolve( const pj_str_t *domain_name, unsigned option, void *token, pj_dns_srv_resolver_cb *cb, - pj_dns_async_query **p_query) + pj_dns_srv_async_query **p_query) { int len; pj_str_t target_name; - pj_dns_srv_resolver_job *query_job; + pj_dns_srv_async_query *query_job; pj_status_t status; PJ_ASSERT_RETURN(domain_name && domain_name->slen && @@ -111,7 +123,8 @@ PJ_DEF(pj_status_t) pj_dns_srv_resolve( const pj_str_t *domain_name, /* Build the query_job state */ - query_job = PJ_POOL_ZALLOC_T(pool, pj_dns_srv_resolver_job); + query_job = PJ_POOL_ZALLOC_T(pool, pj_dns_srv_async_query); + query_job->common.type = PJ_DNS_TYPE_SRV; query_job->objname = target_name.ptr; query_job->resolver = resolver; query_job->token = token; @@ -135,11 +148,45 @@ PJ_DEF(pj_status_t) pj_dns_srv_resolve( const pj_str_t *domain_name, status = pj_dns_resolver_start_query(resolver, &target_name, query_job->dns_state, 0, &dns_callback, - query_job, p_query); + query_job, &query_job->q_srv); + if (status==PJ_SUCCESS && p_query) + *p_query = query_job; + return status; } +/* + * Cancel pending query. + */ +PJ_DEF(pj_status_t) pj_dns_srv_cancel_query(pj_dns_srv_async_query *query, + pj_bool_t notify) +{ + pj_bool_t has_pending = PJ_FALSE; + unsigned i; + + if (query->q_srv) { + pj_dns_resolver_cancel_query(query->q_srv, PJ_FALSE); + query->q_srv = NULL; + has_pending = PJ_TRUE; + } + + for (i=0; isrv_cnt; ++i) { + struct srv_target *srv = &query->srv[i]; + if (srv->q_a) { + pj_dns_resolver_cancel_query(srv->q_a, PJ_FALSE); + srv->q_a = NULL; + has_pending = PJ_TRUE; + } + } + + if (has_pending && notify && query->cb) { + (*query->cb)(query->token, PJ_ECANCELLED, NULL); + } + + return has_pending? PJ_SUCCESS : PJ_EINVALIDOP; +} + #define SWAP(type,ptr1,ptr2) if (ptr1 != ptr2) { \ type tmp; \ @@ -152,7 +199,7 @@ PJ_DEF(pj_status_t) pj_dns_srv_resolve( const pj_str_t *domain_name, /* Build server entries in the query_job based on received SRV response */ -static void build_server_entries(pj_dns_srv_resolver_job *query_job, +static void build_server_entries(pj_dns_srv_async_query *query_job, pj_dns_parsed_packet *response) { unsigned i; @@ -356,23 +403,28 @@ static void build_server_entries(pj_dns_srv_resolver_job *query_job, /* Start DNS A record queries for all SRV records in the query_job structure */ -static pj_status_t resolve_hostnames(pj_dns_srv_resolver_job *query_job) +static pj_status_t resolve_hostnames(pj_dns_srv_async_query *query_job) { unsigned i; pj_status_t err=PJ_SUCCESS, status; query_job->dns_state = PJ_DNS_TYPE_A; for (i=0; isrv_cnt; ++i) { + struct srv_target *srv = &query_job->srv[i]; + PJ_LOG(5, (query_job->objname, "Starting async DNS A query_job for %.*s", - (int)query_job->srv[i].target_name.slen, - query_job->srv[i].target_name.ptr)); + (int)srv->target_name.slen, + srv->target_name.ptr)); + + srv->common.type = PJ_DNS_TYPE_A; + srv->parent = query_job; status = pj_dns_resolver_start_query(query_job->resolver, - &query_job->srv[i].target_name, + &srv->target_name, PJ_DNS_TYPE_A, 0, &dns_callback, - query_job, NULL); + srv, &srv->q_a); if (status != PJ_SUCCESS) { query_job->host_resolved++; err = status; @@ -390,15 +442,29 @@ static void dns_callback(void *user_data, pj_status_t status, pj_dns_parsed_packet *pkt) { - pj_dns_srv_resolver_job *query_job = (pj_dns_srv_resolver_job*) user_data; + struct common *common = (struct common*) user_data; + pj_dns_srv_async_query *query_job; + struct srv_target *srv = NULL; unsigned i; - /* Proceed to next stage */ + if (common->type == PJ_DNS_TYPE_SRV) { + query_job = (pj_dns_srv_async_query*) common; + srv = NULL; + } else if (common->type == PJ_DNS_TYPE_A) { + srv = (struct srv_target*) common; + query_job = srv->parent; + } else { + pj_assert(!"Unexpected user data!"); + return; + } + /* Proceed to next stage */ if (query_job->dns_state == PJ_DNS_TYPE_SRV) { /* We are getting SRV response */ + query_job->q_srv = NULL; + if (status == PJ_SUCCESS && pkt->hdr.anscount != 0) { /* Got SRV response, build server entry. If A records are available * in additional records section of the DNS response, save them too. @@ -468,10 +534,11 @@ static void dns_callback(void *user_data, } else if (query_job->dns_state == PJ_DNS_TYPE_A) { + /* Clear the outstanding job */ + srv->q_a = NULL; + /* Check that we really have answer */ if (status==PJ_SUCCESS && pkt->hdr.anscount != 0) { - unsigned srv_idx; - struct srv_target *srv = NULL; pj_dns_a_record rec; /* Parse response */ @@ -481,24 +548,6 @@ static void dns_callback(void *user_data, pj_assert(rec.addr_count != 0); - /* Find which server entry to be updated. */ - for (srv_idx=0; srv_idxsrv_cnt; ++srv_idx) { - srv = &query_job->srv[srv_idx]; - if (pj_stricmp(&rec.name, &srv->target_name)==0) { - break; - } - } - - if (srv_idx==query_job->srv_cnt) { - /* The DNS A response doesn't match any server names - * we're querying! - */ - status = PJLIB_UTIL_EDNSINANSWER; - goto on_error; - } - - srv = &query_job->srv[srv_idx]; - /* Update CNAME alias, if present. */ if (rec.alias.slen) { pj_assert(rec.alias.slen <= (int)sizeof(srv->cname_buf)); diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/string.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/string.c similarity index 94% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/string.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/string.c index 894763799a3a6bd2fc6b2472c8bafa706096317f..6bab7ebb55dbd98b32f5c6fecdbde240395e3a77 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/string.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/string.c @@ -1,6 +1,7 @@ -/* $Id: string.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: string.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/stun_simple.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/stun_simple.c similarity index 93% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/stun_simple.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/stun_simple.c index 300c265dccff24df6939013495a6ba12564198e8..14f525506ceb71031eb9bcb8a90563fd104f9a8d 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/stun_simple.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/stun_simple.c @@ -1,6 +1,7 @@ -/* $Id: stun_simple.c 1239 2007-05-01 12:25:01Z bennylp $ */ +/* $Id: stun_simple.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,7 +24,7 @@ #include #include -#define THIS_FILE "stun.c" +#define THIS_FILE "stun_simple.c" PJ_DEF(pj_status_t) pjstun_create_bind_req( pj_pool_t *pool, void **msg, pj_size_t *len, @@ -88,6 +89,7 @@ PJ_DEF(pj_status_t) pjstun_parse_msg( void *buf, pj_size_t len, *attr = (pjstun_attr_hdr*)p_attr; len = pj_ntohs((pj_uint16_t) ((*attr)->length)) + sizeof(pjstun_attr_hdr); + len = (len + 3) & ~3; if (msg_len < len) { PJ_LOG(4,(THIS_FILE, "Error: length mismatch in attr %d", diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/stun_simple_client.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/stun_simple_client.c similarity index 97% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/stun_simple_client.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/stun_simple_client.c index e5159372cf418f4624b88b850e4fd7540dff9105..348fcf9c145f0322aff1f3a294219eb91a640b71 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/stun_simple_client.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/stun_simple_client.c @@ -1,6 +1,7 @@ -/* $Id: stun_simple_client.c 1785 2008-02-08 09:43:30Z bennylp $ */ +/* $Id: stun_simple_client.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/symbols.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/symbols.c similarity index 95% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/symbols.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/symbols.c index ec5e8fffd7143dadc47ab93456ab920ca2e69065..3a53cdea3e0d4802831ae0ab581b628976af9db2 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/symbols.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/symbols.c @@ -1,5 +1,6 @@ -/* $Id: symbols.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: symbols.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/xml.c b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/xml.c similarity index 98% rename from libs/pjproject-1.0/pjlib-util/src/pjlib-util/xml.c rename to libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/xml.c index b1aeb033aa8dce5930f4f5a10054494dbe3127c9..499ca7befb99c85d2675292fd1b209907f0f7fe3 100644 --- a/libs/pjproject-1.0/pjlib-util/src/pjlib-util/xml.c +++ b/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/xml.c @@ -1,5 +1,6 @@ -/* $Id: xml.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: xml.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0.1/pjlib/build/os-auto.mak b/libs/pjproject-1.0.1/pjlib/build/os-auto.mak new file mode 100644 index 0000000000000000000000000000000000000000..ffdf386f33ab95ae49e9d4bd538edfaacd22b6a6 --- /dev/null +++ b/libs/pjproject-1.0.1/pjlib/build/os-auto.mak @@ -0,0 +1,35 @@ +# pjlib/build/os-auto.mak. Generated from os-auto.mak.in by configure. + +# Determine OS specific files +AC_OS_OBJS=ioqueue_select.o file_access_unistd.o file_io_ansi.o os_core_unix.o os_error_unix.o os_time_unix.o os_timestamp_posix.o guid_simple.o + +# +# PJLIB_OBJS specified here are object files to be included in PJLIB +# (the library) for this specific operating system. Object files common +# to all operating systems should go in Makefile instead. +# +export PJLIB_OBJS += $(AC_OS_OBJS) \ + addr_resolv_sock.o \ + log_writer_stdout.o \ + os_timestamp_common.o \ + pool_policy_malloc.o sock_bsd.o sock_select.o + +# +# TEST_OBJS are operating system specific object files to be included in +# the test application. +# +export TEST_OBJS += main.o + +# +# Additional LDFLAGS for pjlib-test +# +export TEST_LDFLAGS += -lm -lnsl -lrt -lpthread -lasound + +# +# TARGETS are make targets in the Makefile, to be executed for this given +# operating system. +# +export TARGETS = pjlib pjlib-test + + + diff --git a/libs/pjproject-1.0/pjlib/build/os-auto.mak.in b/libs/pjproject-1.0.1/pjlib/build/os-auto.mak.in similarity index 100% rename from libs/pjproject-1.0/pjlib/build/os-auto.mak.in rename to libs/pjproject-1.0.1/pjlib/build/os-auto.mak.in diff --git a/libs/pjproject-1.0/pjlib/build/os-darwinos.mak b/libs/pjproject-1.0.1/pjlib/build/os-darwinos.mak similarity index 100% rename from libs/pjproject-1.0/pjlib/build/os-darwinos.mak rename to libs/pjproject-1.0.1/pjlib/build/os-darwinos.mak diff --git a/libs/pjproject-1.0/pjlib/build/os-linux-kernel.mak b/libs/pjproject-1.0.1/pjlib/build/os-linux-kernel.mak similarity index 100% rename from libs/pjproject-1.0/pjlib/build/os-linux-kernel.mak rename to libs/pjproject-1.0.1/pjlib/build/os-linux-kernel.mak diff --git a/libs/pjproject-1.0/pjlib/build/os-linux.mak b/libs/pjproject-1.0.1/pjlib/build/os-linux.mak similarity index 100% rename from libs/pjproject-1.0/pjlib/build/os-linux.mak rename to libs/pjproject-1.0.1/pjlib/build/os-linux.mak diff --git a/libs/pjproject-1.0/pjlib/build/os-rtems.mak b/libs/pjproject-1.0.1/pjlib/build/os-rtems.mak similarity index 100% rename from libs/pjproject-1.0/pjlib/build/os-rtems.mak rename to libs/pjproject-1.0.1/pjlib/build/os-rtems.mak diff --git a/libs/pjproject-1.0/pjlib/build/os-sunos.mak b/libs/pjproject-1.0.1/pjlib/build/os-sunos.mak similarity index 100% rename from libs/pjproject-1.0/pjlib/build/os-sunos.mak rename to libs/pjproject-1.0.1/pjlib/build/os-sunos.mak diff --git a/libs/pjproject-1.0/pjlib/build/os-win32.mak b/libs/pjproject-1.0.1/pjlib/build/os-win32.mak similarity index 100% rename from libs/pjproject-1.0/pjlib/build/os-win32.mak rename to libs/pjproject-1.0.1/pjlib/build/os-win32.mak diff --git a/libs/pjproject-1.0/pjlib/build/pjlib++-test.dsp b/libs/pjproject-1.0.1/pjlib/build/pjlib++-test.dsp similarity index 100% rename from libs/pjproject-1.0/pjlib/build/pjlib++-test.dsp rename to libs/pjproject-1.0.1/pjlib/build/pjlib++-test.dsp diff --git a/libs/pjproject-1.0/pjlib/build/pjlib++.dsp b/libs/pjproject-1.0.1/pjlib/build/pjlib++.dsp similarity index 100% rename from libs/pjproject-1.0/pjlib/build/pjlib++.dsp rename to libs/pjproject-1.0.1/pjlib/build/pjlib++.dsp diff --git a/libs/pjproject-1.0/pjlib/build/pjlib.dsp b/libs/pjproject-1.0.1/pjlib/build/pjlib.dsp similarity index 100% rename from libs/pjproject-1.0/pjlib/build/pjlib.dsp rename to libs/pjproject-1.0.1/pjlib/build/pjlib.dsp diff --git a/libs/pjproject-1.0/pjlib/build/pjlib.dsw b/libs/pjproject-1.0.1/pjlib/build/pjlib.dsw similarity index 100% rename from libs/pjproject-1.0/pjlib/build/pjlib.dsw rename to libs/pjproject-1.0.1/pjlib/build/pjlib.dsw diff --git a/libs/pjproject-1.0/pjlib/build/pjlib.vcproj b/libs/pjproject-1.0.1/pjlib/build/pjlib.vcproj similarity index 100% rename from libs/pjproject-1.0/pjlib/build/pjlib.vcproj rename to libs/pjproject-1.0.1/pjlib/build/pjlib.vcproj diff --git a/libs/pjproject-1.0/pjlib/build/pjlib_samples.dsp b/libs/pjproject-1.0.1/pjlib/build/pjlib_samples.dsp similarity index 100% rename from libs/pjproject-1.0/pjlib/build/pjlib_samples.dsp rename to libs/pjproject-1.0.1/pjlib/build/pjlib_samples.dsp diff --git a/libs/pjproject-1.0/pjlib/build/pjlib_samples.mak b/libs/pjproject-1.0.1/pjlib/build/pjlib_samples.mak similarity index 100% rename from libs/pjproject-1.0/pjlib/build/pjlib_samples.mak rename to libs/pjproject-1.0.1/pjlib/build/pjlib_samples.mak diff --git a/libs/pjproject-1.0/pjlib/build/pjlib_test.dsp b/libs/pjproject-1.0.1/pjlib/build/pjlib_test.dsp similarity index 100% rename from libs/pjproject-1.0/pjlib/build/pjlib_test.dsp rename to libs/pjproject-1.0.1/pjlib/build/pjlib_test.dsp diff --git a/libs/pjproject-1.0/pjlib/build/pjlib_test.vcproj b/libs/pjproject-1.0.1/pjlib/build/pjlib_test.vcproj similarity index 100% rename from libs/pjproject-1.0/pjlib/build/pjlib_test.vcproj rename to libs/pjproject-1.0.1/pjlib/build/pjlib_test.vcproj diff --git a/libs/pjproject-1.0/pjlib/build/wince-evc4/pjlib_test_wince.vcp b/libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_test_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjlib/build/wince-evc4/pjlib_test_wince.vcp rename to libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_test_wince.vcp diff --git a/libs/pjproject-1.0/pjlib/build/wince-evc4/pjlib_wince.vcp b/libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjlib/build/wince-evc4/pjlib_wince.vcp rename to libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_wince.vcp diff --git a/libs/pjproject-1.0/pjlib/build/wince-evc4/pjlib_wince.vcw b/libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_wince.vcw similarity index 100% rename from libs/pjproject-1.0/pjlib/build/wince-evc4/pjlib_wince.vcw rename to libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_wince.vcw diff --git a/libs/pjproject-1.0/pjlib/docs/doxygen.cfg b/libs/pjproject-1.0.1/pjlib/docs/doxygen.cfg similarity index 100% rename from libs/pjproject-1.0/pjlib/docs/doxygen.cfg rename to libs/pjproject-1.0.1/pjlib/docs/doxygen.cfg diff --git a/libs/pjproject-1.0/pjlib/docs/doxygen.css b/libs/pjproject-1.0.1/pjlib/docs/doxygen.css similarity index 100% rename from libs/pjproject-1.0/pjlib/docs/doxygen.css rename to libs/pjproject-1.0.1/pjlib/docs/doxygen.css diff --git a/libs/pjproject-1.0/pjlib/docs/footer.html b/libs/pjproject-1.0.1/pjlib/docs/footer.html similarity index 80% rename from libs/pjproject-1.0/pjlib/docs/footer.html rename to libs/pjproject-1.0.1/pjlib/docs/footer.html index 6eea5a91fb0a07dc2a04dd46ec3f749df2434fda..fd759b0f960ec3917420ca63d40f09de36c45b56 100644 --- a/libs/pjproject-1.0/pjlib/docs/footer.html +++ b/libs/pjproject-1.0.1/pjlib/docs/footer.html @@ -1,7 +1,7 @@

 

PJLIB Open Source, high performance, small footprint, and very very portable framework
-(C)2001-2008 Benny Prijono +Copyright (C) 2006-2009 Teluu Inc.
diff --git a/libs/pjproject-1.0/pjlib/docs/header.html b/libs/pjproject-1.0.1/pjlib/docs/header.html similarity index 100% rename from libs/pjproject-1.0/pjlib/docs/header.html rename to libs/pjproject-1.0.1/pjlib/docs/header.html diff --git a/libs/pjproject-1.0/pjlib/include/pj++/file.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/file.hpp similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj++/file.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/file.hpp index b7112c249562b860e6a31153091967a4207e719e..d37defc36116679623f54e5aa67e405881eddf08 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/file.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/file.hpp @@ -1,6 +1,7 @@ -/* $Id: file.hpp 122 2006-01-18 23:32:27Z bennylp $ */ +/* $Id: file.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/hash.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/hash.hpp similarity index 94% rename from libs/pjproject-1.0/pjlib/include/pj++/hash.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/hash.hpp index d8228514d609bd2e79f1b8a2ff6f5f6933bf2aa1..b8b0a9a642d5ae9a0c28f4bb3a695b9a73e54b8f 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/hash.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/hash.hpp @@ -1,6 +1,7 @@ -/* $Id: hash.hpp 65 2005-11-21 01:55:47Z bennylp $ */ +/* $Id: hash.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/list.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/list.hpp similarity index 97% rename from libs/pjproject-1.0/pjlib/include/pj++/list.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/list.hpp index 0891eb87f6cdf5162af60df4b7d5dcb9100424aa..24217c9b7bc2a7731e1cfe7bd9a0ccb490ce8089 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/list.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/list.hpp @@ -1,6 +1,7 @@ -/* $Id: list.hpp 127 2006-01-30 18:40:05Z bennylp $ */ +/* $Id: list.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/lock.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/lock.hpp similarity index 94% rename from libs/pjproject-1.0/pjlib/include/pj++/lock.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/lock.hpp index 323e82a435244bb90517ff691931a9a127adf6e8..43779a69be548c3b3f1555c43e86bdd6e74f3df5 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/lock.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/lock.hpp @@ -1,6 +1,7 @@ -/* $Id: lock.hpp 65 2005-11-21 01:55:47Z bennylp $ */ +/* $Id: lock.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/os.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/os.hpp similarity index 98% rename from libs/pjproject-1.0/pjlib/include/pj++/os.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/os.hpp index 69173f02f97ca465a81d9cfa4730600309ce041f..6c87f31ef2b117cb6705dfe1815010f3b009d137 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/os.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/os.hpp @@ -1,6 +1,7 @@ -/* $Id: os.hpp 122 2006-01-18 23:32:27Z bennylp $ */ +/* $Id: os.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/pool.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/pool.hpp similarity index 96% rename from libs/pjproject-1.0/pjlib/include/pj++/pool.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/pool.hpp index 5196dfd5645c042c06ca2895b2f9c233556afd16..8800ddbda78dde1357f136750af8590c067c1c64 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/pool.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/pool.hpp @@ -1,6 +1,7 @@ -/* $Id: pool.hpp 127 2006-01-30 18:40:05Z bennylp $ */ +/* $Id: pool.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/proactor.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/proactor.hpp similarity index 98% rename from libs/pjproject-1.0/pjlib/include/pj++/proactor.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/proactor.hpp index 42bdbbdc643dcf7a2f1e4980f1e50fd5710cd658..7e335645c255110c1ee6ba6fa5d749112c91fc1a 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/proactor.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/proactor.hpp @@ -1,6 +1,7 @@ -/* $Id: proactor.hpp 122 2006-01-18 23:32:27Z bennylp $ */ +/* $Id: proactor.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/scanner.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/scanner.hpp similarity index 96% rename from libs/pjproject-1.0/pjlib/include/pj++/scanner.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/scanner.hpp index 45236445af2ece216db4868cf4760fe5e727b7ae..a3de6d88c4fe89250dbdacec3c5430abc2b28807 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/scanner.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/scanner.hpp @@ -1,6 +1,7 @@ -/* $Id: scanner.hpp 122 2006-01-18 23:32:27Z bennylp $ */ +/* $Id: scanner.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/sock.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/sock.hpp similarity index 97% rename from libs/pjproject-1.0/pjlib/include/pj++/sock.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/sock.hpp index 0edd97effb18f0f4353e489133726254d3ec403e..1b2b67a33b9055a5c8a4ba3080c21090a5cffdc2 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/sock.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/sock.hpp @@ -1,6 +1,7 @@ -/* $Id: sock.hpp 122 2006-01-18 23:32:27Z bennylp $ */ +/* $Id: sock.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/string.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/string.hpp similarity index 97% rename from libs/pjproject-1.0/pjlib/include/pj++/string.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/string.hpp index d447127c91beb35cf716d0a336b987176cb03379..3c2168566b5b4ae272420b1586caa7418cee0b6a 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/string.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/string.hpp @@ -1,6 +1,7 @@ -/* $Id: string.hpp 127 2006-01-30 18:40:05Z bennylp $ */ +/* $Id: string.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/timer.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/timer.hpp similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj++/timer.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/timer.hpp index aa16e79a5fd59e22c006e4bf1849878514268d50..c6bae69b20c710de0bb6416bc744a98d5c46c5f4 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/timer.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/timer.hpp @@ -1,6 +1,7 @@ -/* $Id: timer.hpp 122 2006-01-18 23:32:27Z bennylp $ */ +/* $Id: timer.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/tree.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/tree.hpp similarity index 94% rename from libs/pjproject-1.0/pjlib/include/pj++/tree.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/tree.hpp index c06426f19bf76143dea0cbedb80dbc26b9fca5b8..2c963ab9097b13ea2c833397db09a7629b6cd4a7 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/tree.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/tree.hpp @@ -1,6 +1,7 @@ -/* $Id: tree.hpp 65 2005-11-21 01:55:47Z bennylp $ */ +/* $Id: tree.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj++/types.hpp b/libs/pjproject-1.0.1/pjlib/include/pj++/types.hpp similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj++/types.hpp rename to libs/pjproject-1.0.1/pjlib/include/pj++/types.hpp index 446f4c5fc4684077b9ad59342f4c1541de630603..4140a347cc7e2b5f888064a84dc648d72d650fce 100644 --- a/libs/pjproject-1.0/pjlib/include/pj++/types.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pj++/types.hpp @@ -1,6 +1,7 @@ -/* $Id: types.hpp 127 2006-01-30 18:40:05Z bennylp $ */ +/* $Id: types.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/activesock.h b/libs/pjproject-1.0.1/pjlib/include/pj/activesock.h similarity index 99% rename from libs/pjproject-1.0/pjlib/include/pj/activesock.h rename to libs/pjproject-1.0.1/pjlib/include/pj/activesock.h index 18d6a33d2937053289baae3351c0be82f0706d85..3611d3a35169d2e4e6a63d39a9521324bffeba8c 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/activesock.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/activesock.h @@ -1,6 +1,7 @@ -/* $Id: activesock.h 2187 2008-08-04 09:59:02Z bennylp $ */ +/* $Id: activesock.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/addr_resolv.h b/libs/pjproject-1.0.1/pjlib/include/pj/addr_resolv.h similarity index 96% rename from libs/pjproject-1.0/pjlib/include/pj/addr_resolv.h rename to libs/pjproject-1.0.1/pjlib/include/pj/addr_resolv.h index fc295176405ec7044a647f6adeeb509e119fd904..71c0640cbf9f798048f9d957fbde8f34a624b941 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/addr_resolv.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/addr_resolv.h @@ -1,6 +1,7 @@ -/* $Id: addr_resolv.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: addr_resolv.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/array.h b/libs/pjproject-1.0.1/pjlib/include/pj/array.h similarity index 94% rename from libs/pjproject-1.0/pjlib/include/pj/array.h rename to libs/pjproject-1.0.1/pjlib/include/pj/array.h index c3e1f6fc5145672bf37cf078c5b2fe0c5068c14c..9c13df80d056a72c626828dbf7d093aaeba18326 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/array.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/array.h @@ -1,6 +1,7 @@ -/* $Id: array.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: array.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/assert.h b/libs/pjproject-1.0.1/pjlib/include/pj/assert.h similarity index 94% rename from libs/pjproject-1.0/pjlib/include/pj/assert.h rename to libs/pjproject-1.0.1/pjlib/include/pj/assert.h index 09a8ee3561e533b1297e0906ff8f19193ad2d7cd..65a7a4a88d66169c5b79d385d367822f77856a10 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/assert.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/assert.h @@ -1,6 +1,7 @@ -/* $Id: assert.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: assert.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/assert.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/assert.h similarity index 87% rename from libs/pjproject-1.0/pjlib/include/pj/compat/assert.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/assert.h index 96b2ff4dd3824fb1c5de64709aba1885a0e6bc64..5ced41e3c62a5597b86507fd6ca9470e4b33be28 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/assert.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/assert.h @@ -1,6 +1,7 @@ -/* $Id: assert.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: assert.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_armcc.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_armcc.h similarity index 88% rename from libs/pjproject-1.0/pjlib/include/pj/compat/cc_armcc.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_armcc.h index e222aa5d48e232895f0423a5a1c3e58382428e06..45420b5bbac3f6bc1a618fb2458426d3817e7234 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_armcc.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_armcc.h @@ -1,6 +1,7 @@ -/* $Id: cc_armcc.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: cc_armcc.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_codew.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_codew.h similarity index 89% rename from libs/pjproject-1.0/pjlib/include/pj/compat/cc_codew.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_codew.h index e061aaf2108f9ed5795e0136750bc57cae056305..54ca3260debfd2dc1246828e40f833edb3f753ba 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_codew.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_codew.h @@ -1,6 +1,7 @@ -/* $Id: cc_codew.h 1858 2008-03-11 13:38:37Z bennylp $ */ +/* $Id: cc_codew.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_gcc.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_gcc.h similarity index 91% rename from libs/pjproject-1.0/pjlib/include/pj/compat/cc_gcc.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_gcc.h index ae7a45c4b948a0fb1b42ded15887af77505e0cf4..05909514419f001a2587b7662a6da3127faec5d8 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_gcc.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_gcc.h @@ -1,6 +1,7 @@ -/* $Id: cc_gcc.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: cc_gcc.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_gcce.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_gcce.h similarity index 88% rename from libs/pjproject-1.0/pjlib/include/pj/compat/cc_gcce.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_gcce.h index 33f134cf9dcf0c41635886546b1eaa78a91e32a4..5e423781ea56e1ead2ce42d0f3e06a9707e0ea99 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_gcce.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_gcce.h @@ -1,6 +1,7 @@ -/* $Id: cc_gcce.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: cc_gcce.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_msvc.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_msvc.h similarity index 92% rename from libs/pjproject-1.0/pjlib/include/pj/compat/cc_msvc.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_msvc.h index 17161ef0be033bb492843a7a87038e54072eceef..13825f2f5cddc8674ba7162448ca6f5688023772 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_msvc.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_msvc.h @@ -1,6 +1,7 @@ -/* $Id: cc_msvc.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: cc_msvc.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_mwcc.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_mwcc.h similarity index 88% rename from libs/pjproject-1.0/pjlib/include/pj/compat/cc_mwcc.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_mwcc.h index e4baf3d7f65bfe41da948feeba429404ca8c4e67..33319951f78dd864bdb5fb4a1f10616b2dceec5b 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/cc_mwcc.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_mwcc.h @@ -1,6 +1,7 @@ -/* $Id: cc_mwcc.h 1858 2008-03-11 13:38:37Z bennylp $ */ +/* $Id: cc_mwcc.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/ctype.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/ctype.h similarity index 90% rename from libs/pjproject-1.0/pjlib/include/pj/compat/ctype.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/ctype.h index e27636c8456541ef6503f5af04f8fb8d964a5070..a714964bc70cdaaec4b2f663a88b504f55f203eb 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/ctype.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/ctype.h @@ -1,6 +1,7 @@ -/* $Id: ctype.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ctype.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/errno.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/errno.h similarity index 88% rename from libs/pjproject-1.0/pjlib/include/pj/compat/errno.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/errno.h index 92e31bd0ddaafcb8586f8242e45b1de450f84658..fc39bfb9f34cfe0719831f911554a763a73e68c3 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/errno.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/errno.h @@ -1,6 +1,7 @@ -/* $Id: errno.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: errno.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/high_precision.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/high_precision.h similarity index 93% rename from libs/pjproject-1.0/pjlib/include/pj/compat/high_precision.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/high_precision.h index 5b5f479278efa5a873864450f8e9770beaf9bc83..1bbcf0350bf80237cebacda3e8c543b63223b996 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/high_precision.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/high_precision.h @@ -1,6 +1,7 @@ -/* $Id: high_precision.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: high_precision.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/m_alpha.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_alpha.h similarity index 85% rename from libs/pjproject-1.0/pjlib/include/pj/compat/m_alpha.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/m_alpha.h index 8af3a52700e38c10b31296c4261f8995585eef95..5ccbaddcb35f2719237af5fd204c57fb524ab92c 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/m_alpha.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_alpha.h @@ -1,6 +1,7 @@ -/* $Id: m_alpha.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: m_alpha.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/m_armv4.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_armv4.h similarity index 85% rename from libs/pjproject-1.0/pjlib/include/pj/compat/m_armv4.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/m_armv4.h index 53d807bf7e130901f18fa9a7e28df348f73e5154..4c804f8cb6e8cc56dfa31612c35ed1d39d3c2dd0 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/m_armv4.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_armv4.h @@ -1,6 +1,7 @@ -/* $Id: m_armv4.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: m_armv4.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h new file mode 100644 index 0000000000000000000000000000000000000000..09ce93ea06fea5d5872d54ae7c95178ce2df086d --- /dev/null +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h @@ -0,0 +1,50 @@ +/* pjlib/include/pj/compat/m_auto.h. Generated by configure. */ +/* $Id: m_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ +/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __PJ_COMPAT_M_AUTO_H__ +#define __PJ_COMPAT_M_AUTO_H__ + +/** + * @file m_auto.h + * @brief Automatically generated process definition file. + */ + +/* Machine name, filled in by autoconf script */ +#define PJ_M_NAME "i686" + +/* Endianness, as detected by autoconf */ +/* #undef WORDS_BIGENDIAN */ + +#ifdef WORDS_BIGENDIAN +# define PJ_IS_LITTLE_ENDIAN 0 +# define PJ_IS_BIG_ENDIAN 1 +#else +# define PJ_IS_LITTLE_ENDIAN 1 +# define PJ_IS_BIG_ENDIAN 0 +#endif + + +/* Specify if floating point is present/desired */ +#define PJ_HAS_FLOATING_POINT 1 + +/* Deprecated */ +#define PJ_HAS_PENTIUM 0 + +#endif /* __PJ_COMPAT_M_AUTO_H__ */ diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/m_auto.h.in b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h.in similarity index 88% rename from libs/pjproject-1.0/pjlib/include/pj/compat/m_auto.h.in rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h.in index d58f2ba2ace81fe73943d9c76139db6cea4989ff..dac97d0ce683c8a401a3f4c08ff753ce447d1489 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/m_auto.h.in +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h.in @@ -1,6 +1,7 @@ -/* $Id: m_auto.h.in 698 2006-09-10 08:53:59Z bennylp $ */ +/* $Id: m_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/m_i386.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_i386.h similarity index 85% rename from libs/pjproject-1.0/pjlib/include/pj/compat/m_i386.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/m_i386.h index 4aba5b3947a1548ca3330e72ebf9745321121390..2a0aeb7e18ca7e19367a6ed34c408ba19efd0fe5 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/m_i386.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_i386.h @@ -1,6 +1,7 @@ -/* $Id: m_i386.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: m_i386.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/m_m68k.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_m68k.h similarity index 85% rename from libs/pjproject-1.0/pjlib/include/pj/compat/m_m68k.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/m_m68k.h index 8097d61a904b7a691d16cd64e25e7eca44df4dbb..b3203f69ab48e22491eea9bd5dc7e6f6498177a2 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/m_m68k.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_m68k.h @@ -1,6 +1,7 @@ -/* $Id: m_m68k.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: m_m68k.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/m_powerpc.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_powerpc.h similarity index 85% rename from libs/pjproject-1.0/pjlib/include/pj/compat/m_powerpc.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/m_powerpc.h index b2d26fa86ac86259ee912ab8162cff4cf29ce6ca..20a50bdfa3717a1b6e6d054655c51518fbc434f2 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/m_powerpc.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_powerpc.h @@ -1,6 +1,7 @@ -/* $Id: m_powerpc.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: m_powerpc.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/m_sparc.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_sparc.h similarity index 85% rename from libs/pjproject-1.0/pjlib/include/pj/compat/m_sparc.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/m_sparc.h index 7cc31616880160a991105b18e7d718d2ae1ccbb5..ac74f1f61b17538c6552f917117983aca53aed8f 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/m_sparc.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_sparc.h @@ -1,6 +1,7 @@ -/* $Id: m_sparc.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: m_sparc.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/m_x86_64.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_x86_64.h similarity index 85% rename from libs/pjproject-1.0/pjlib/include/pj/compat/m_x86_64.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/m_x86_64.h index f278d78cb06819b2f5bff2a135c340430681c165..11599aa617ddce8ad5f5a541d0206a5c4c5badaf 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/m_x86_64.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_x86_64.h @@ -1,6 +1,7 @@ -/* $Id: m_x86_64.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: m_x86_64.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/malloc.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/malloc.h similarity index 85% rename from libs/pjproject-1.0/pjlib/include/pj/compat/malloc.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/malloc.h index 52e942c5814e2f0e22f1f5a03ea0ce3704c3f8bb..66368e170367f12a708e6c347521bce5787895dd 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/malloc.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/malloc.h @@ -1,6 +1,7 @@ -/* $Id: malloc.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: malloc.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h new file mode 100644 index 0000000000000000000000000000000000000000..a2063c67dca115b6a61f3fcd1d1af27f00d85663 --- /dev/null +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h @@ -0,0 +1,185 @@ +/* pjlib/include/pj/compat/os_auto.h. Generated by configure. */ +/* $Id: os_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ +/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __PJ_COMPAT_OS_AUTO_H__ +#define __PJ_COMPAT_OS_AUTO_H__ + +/** + * @file os_auto.h + * @brief Describes operating system specifics (automatically detected by + * autoconf) + */ + +/* Canonical OS name */ +#define PJ_OS_NAME "i686-pc-linux-gnu" + +/* Legacy macros */ +/* #undef PJ_WIN32 */ +/* #undef PJ_WIN32_WINNT */ +/* #undef WIN32_LEAN_AND_MEAN */ +/* #undef PJ_DARWINOS */ +#define PJ_LINUX 1 +/* #undef PJ_RTEMS */ +/* #undef PJ_SUNOS */ + +#if defined(PJ_WIN32_WINNT) && !defined(_WIN32_WINNT) +# define _WIN32_WINNT PJ_WIN32_WINNT +#endif + +/* Headers availability */ +#define PJ_HAS_ARPA_INET_H 1 +#define PJ_HAS_ASSERT_H 1 +#define PJ_HAS_CTYPE_H 1 +#define PJ_HAS_ERRNO_H 1 +#define PJ_HAS_FCNTL_H 1 +#define PJ_HAS_LINUX_SOCKET_H 1 +#define PJ_HAS_MALLOC_H 1 +#define PJ_HAS_NETDB_H 1 +#define PJ_HAS_NETINET_IN_SYSTM_H 1 +#define PJ_HAS_NETINET_IN_H 1 +#define PJ_HAS_NETINET_IP_H 1 +#define PJ_HAS_NET_IF_H 1 +#define PJ_HAS_IFADDRS_H 1 +#define PJ_HAS_SEMAPHORE_H 1 +#define PJ_HAS_SETJMP_H 1 +#define PJ_HAS_STDARG_H 1 +#define PJ_HAS_STDDEF_H 1 +#define PJ_HAS_STDIO_H 1 +#define PJ_HAS_STDINT_H 1 +#define PJ_HAS_STDLIB_H 1 +#define PJ_HAS_STRING_H 1 +#define PJ_HAS_SYS_IOCTL_H 1 +#define PJ_HAS_SYS_SELECT_H 1 +#define PJ_HAS_SYS_SOCKET_H 1 +#define PJ_HAS_SYS_TIME_H 1 +#define PJ_HAS_SYS_TIMEB_H 1 +#define PJ_HAS_SYS_TYPES_H 1 +#define PJ_HAS_TIME_H 1 +#define PJ_HAS_UNISTD_H 1 + +/* #undef PJ_HAS_MSWSOCK_H */ +/* #undef PJ_HAS_WINSOCK_H */ +/* #undef PJ_HAS_WINSOCK2_H */ +/* #undef PJ_HAS_WS2TCPIP_H */ + +#define PJ_SOCK_HAS_INET_ATON 1 +#define PJ_SOCK_HAS_INET_PTON 1 +#define PJ_SOCK_HAS_INET_NTOP 1 +#define PJ_SOCK_HAS_GETADDRINFO 1 + +/* On these OSes, semaphore feature depends on semaphore.h */ +#if defined(PJ_HAS_SEMAPHORE_H) && PJ_HAS_SEMAPHORE_H!=0 +# define PJ_HAS_SEMAPHORE 1 +#elif defined(PJ_WIN32) && PJ_WIN32!=0 +# define PJ_HAS_SEMAPHORE 1 +#else +# define PJ_HAS_SEMAPHORE 0 +#endif + +/* Do we have pthread_mutexattr_settype()? */ +/* #undef PJ_HAS_PTHREAD_MUTEXATTR_SETTYPE */ + +/* Does pthread_mutexattr_t has "recursive" member? */ +/* #undef PJ_PTHREAD_MUTEXATTR_T_HAS_RECURSIVE */ + +/* Set 1 if native sockaddr_in has sin_len member. + * Default: 0 + */ +/* #undef PJ_SOCKADDR_HAS_LEN */ + +/* Does the OS have socklen_t? */ +#define PJ_HAS_SOCKLEN_T 1 + +#if !defined(socklen_t) && (!defined(PJ_HAS_SOCKLEN_T) || PJ_HAS_SOCKLEN_T==0) +# define PJ_HAS_SOCKLEN_T 1 + typedef int socklen_t; +#endif + +/** + * If this macro is set, it tells select I/O Queue that select() needs to + * be given correct value of nfds (i.e. largest fd + 1). This requires + * select ioqueue to re-scan the descriptors on each registration and + * unregistration. + * If this macro is not set, then ioqueue will always give FD_SETSIZE for + * nfds argument when calling select(). + * + * Default: 0 + */ +#define PJ_SELECT_NEEDS_NFDS 0 + +/* Is errno a good way to retrieve OS errors? + */ +#define PJ_HAS_ERRNO_VAR 1 + +/* When this macro is set, getsockopt(SOL_SOCKET, SO_ERROR) will return + * the status of non-blocking connect() operation. + */ +#define PJ_HAS_SO_ERROR 1 + +/* This value specifies the value set in errno by the OS when a non-blocking + * socket recv() can not return immediate daata. + */ +#define PJ_BLOCKING_ERROR_VAL EAGAIN + +/* This value specifies the value set in errno by the OS when a non-blocking + * socket connect() can not get connected immediately. + */ +#define PJ_BLOCKING_CONNECT_ERROR_VAL EINPROGRESS + +/* Default threading is enabled, unless it's overridden. */ +#ifndef PJ_HAS_THREADS +# define PJ_HAS_THREADS (1) +#endif + +/* Do we need high resolution timer? */ +#define PJ_HAS_HIGH_RES_TIMER 1 + +/* Is malloc() available? */ +#define PJ_HAS_MALLOC 1 + +#ifndef PJ_OS_HAS_CHECK_STACK +# define PJ_OS_HAS_CHECK_STACK 0 +#endif + +/* Unicode? */ +#define PJ_NATIVE_STRING_IS_UNICODE 0 + +/* Pool alignment in bytes */ +#define PJ_POOL_ALIGNMENT 4 + +/* The type of atomic variable value: */ +#define PJ_ATOMIC_VALUE_TYPE long + +/* If 1, use Read/Write mutex emulation for platforms that don't support it */ +#define PJ_EMULATE_RWMUTEX 0 + +/* If 1, pj_thread_create() should enforce the stack size when creating + * threads. + * Default: 0 (let OS decide the thread's stack size). + */ +#define PJ_THREAD_SET_STACK_SIZE 0 + +/* If 1, pj_thread_create() should allocate stack from the pool supplied. + * Default: 0 (let OS allocate memory for thread's stack). + */ +#define PJ_THREAD_ALLOCATE_STACK 0 + +#endif /* __PJ_COMPAT_OS_AUTO_H__ */ + diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/os_auto.h.in b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h.in similarity index 96% rename from libs/pjproject-1.0/pjlib/include/pj/compat/os_auto.h.in rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h.in index 9e216b658d8a38a8bf301053567546249b0be675..e922a9b952a8bd9b7f9e7bb9a1d4c1223b52f837 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/os_auto.h.in +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h.in @@ -1,6 +1,7 @@ -/* $Id: os_auto.h.in 2331 2008-09-27 13:16:35Z bennylp $ */ +/* $Id: os_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/os_darwinos.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_darwinos.h similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj/compat/os_darwinos.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/os_darwinos.h index 695c369e7d27a3c245afdd0e0a5f49dd3f36f261..6fff31157966dbf56de4c5527299a1c5a10c0bb4 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/os_darwinos.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_darwinos.h @@ -1,6 +1,7 @@ -/* $Id: os_darwinos.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_darwinos.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/os_linux.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_linux.h similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj/compat/os_linux.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/os_linux.h index 9675e8db053c8715e62ee8c33666cf36f801b85f..a13354922249bc32eddcca6cba59258cdfe6273a 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/os_linux.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_linux.h @@ -1,6 +1,7 @@ -/* $Id: os_linux.h 2289 2008-09-17 12:55:26Z nanang $ */ +/* $Id: os_linux.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/os_linux_kernel.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_linux_kernel.h similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj/compat/os_linux_kernel.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/os_linux_kernel.h index 6c76e837b8999be521cc75a9f80db0245bccc850..1aca5719f47df22ddf9616a2e5287aba09100922 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/os_linux_kernel.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_linux_kernel.h @@ -1,6 +1,7 @@ -/* $Id: os_linux_kernel.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_linux_kernel.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/os_palmos.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_palmos.h similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj/compat/os_palmos.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/os_palmos.h index 3a9d15cf28284256d4162db3c223060aee79dc00..deff12c6dcdb48c25d991c2172f9560b503e86f7 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/os_palmos.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_palmos.h @@ -1,6 +1,7 @@ -/* $Id: os_palmos.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_palmos.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/os_rtems.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_rtems.h similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj/compat/os_rtems.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/os_rtems.h index 1ce5b7aa94f3235c6157067bc249ea0045979ac5..e0133d5c9f9f70f0c65d9aa553cec65f9e648f8b 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/os_rtems.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_rtems.h @@ -1,6 +1,7 @@ -/* $Id: os_rtems.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_rtems.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/os_sunos.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_sunos.h similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj/compat/os_sunos.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/os_sunos.h index a97c1bda3d1171d589632b74a2b45ee141ed1209..ef52f000ba0e4abb57b1fde1b3e4220660673030 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/os_sunos.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_sunos.h @@ -1,6 +1,7 @@ -/* $Id: os_sunos.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_sunos.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/os_symbian.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_symbian.h similarity index 96% rename from libs/pjproject-1.0/pjlib/include/pj/compat/os_symbian.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/os_symbian.h index 8922a9f20678c21a03172bcf1de75a633ba9bb5a..0be99e6c0ad0629f3aa01b8130d88531c1c5151e 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/os_symbian.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_symbian.h @@ -1,6 +1,7 @@ -/* $Id: os_symbian.h 1405 2007-07-20 08:08:30Z bennylp $ */ +/* $Id: os_symbian.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/os_win32.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_win32.h similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj/compat/os_win32.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/os_win32.h index 8182008d15aef034a07210d08c7cbeac776b6d5b..8283491ec688ecf0916f1bda481da3386314d6c0 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/os_win32.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_win32.h @@ -1,6 +1,7 @@ -/* $Id: os_win32.h 2331 2008-09-27 13:16:35Z bennylp $ */ +/* $Id: os_win32.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/os_win32_wince.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_win32_wince.h similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj/compat/os_win32_wince.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/os_win32_wince.h index c9be6b908bc22d16f1a45acb47b366e7c2fa25e6..e110caa3f996b281a0e98957cbe04f6b901a39fe 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/os_win32_wince.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_win32_wince.h @@ -1,6 +1,7 @@ -/* $Id: os_win32_wince.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_win32_wince.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/rand.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/rand.h similarity index 91% rename from libs/pjproject-1.0/pjlib/include/pj/compat/rand.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/rand.h index 133f560d8824f71fcbc4e542656844fb178c54dc..b0179450d08ccc8102298a6dad86c1c6f74620a6 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/rand.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/rand.h @@ -1,6 +1,7 @@ -/* $Id: rand.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: rand.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/setjmp.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/setjmp.h similarity index 94% rename from libs/pjproject-1.0/pjlib/include/pj/compat/setjmp.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/setjmp.h index 111a9c33d5ad2be8bc0042d91af53c0efedf13b6..ecf8ed729b0c117d17258c5ab24b09f643c7d437 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/setjmp.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/setjmp.h @@ -1,6 +1,7 @@ -/* $Id: setjmp.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: setjmp.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/size_t.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/size_t.h similarity index 83% rename from libs/pjproject-1.0/pjlib/include/pj/compat/size_t.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/size_t.h index 8d8beb5f9819ad6e9d4589e4451ec3eadca2a621..d3c270cc3de35d0f20d090b0908edf3d73f71c51 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/size_t.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/size_t.h @@ -1,6 +1,7 @@ -/* $Id: size_t.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: size_t.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/socket.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/socket.h similarity index 97% rename from libs/pjproject-1.0/pjlib/include/pj/compat/socket.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/socket.h index dbe98024d8ed11404eef1c4a0dd06207ac921110..3f2e787f86f19ded0b714717972d4322f877158f 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/socket.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/socket.h @@ -1,6 +1,7 @@ -/* $Id: socket.h 2331 2008-09-27 13:16:35Z bennylp $ */ +/* $Id: socket.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/stdarg.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/stdarg.h similarity index 84% rename from libs/pjproject-1.0/pjlib/include/pj/compat/stdarg.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/stdarg.h index 75f9a7d1693310752058a5057f8cea6374045761..202b90563db02b48420b92c9b7f37ddf3002f4e6 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/stdarg.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/stdarg.h @@ -1,6 +1,7 @@ -/* $Id: stdarg.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: stdarg.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/stdfileio.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/stdfileio.h similarity index 84% rename from libs/pjproject-1.0/pjlib/include/pj/compat/stdfileio.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/stdfileio.h index 0704323b4ad0ddc8b6e2c7c6a92e2948330cd89b..56655232ad1038b0b513128f658e9fe5a799e287 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/stdfileio.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/stdfileio.h @@ -1,6 +1,7 @@ -/* $Id: stdfileio.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: stdfileio.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/string.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/string.h similarity index 96% rename from libs/pjproject-1.0/pjlib/include/pj/compat/string.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/string.h index e947066f3bdf83e063558cb961815da952bf254f..198fbe98509b59bc742fbbc707d7a96d012ae786 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/string.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/string.h @@ -1,6 +1,7 @@ -/* $Id: string.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: string.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/compat/time.h b/libs/pjproject-1.0.1/pjlib/include/pj/compat/time.h similarity index 86% rename from libs/pjproject-1.0/pjlib/include/pj/compat/time.h rename to libs/pjproject-1.0.1/pjlib/include/pj/compat/time.h index 3994231c1f661e5880ae18861eb883560c6bbb41..8a4465719fc4de94fa0d0b7d1e840a39aa0c9a73 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/compat/time.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/compat/time.h @@ -1,6 +1,7 @@ -/* $Id: time.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: time.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/config.h b/libs/pjproject-1.0.1/pjlib/include/pj/config.h similarity index 99% rename from libs/pjproject-1.0/pjlib/include/pj/config.h rename to libs/pjproject-1.0.1/pjlib/include/pj/config.h index a27546ac1536b408b2a71762a21cc5ba998371f9..d28c31e989d085db464ca42b3ff2bb651fb4af9e 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/config.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/config.h @@ -1,6 +1,7 @@ -/* $Id: config.h 2112 2008-07-07 21:31:02Z bennylp $ */ +/* $Id: config.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/README.TXT b/libs/pjproject-1.0.1/pjlib/include/pj/config_site.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/README.TXT rename to libs/pjproject-1.0.1/pjlib/include/pj/config_site.h diff --git a/libs/pjproject-1.0/pjlib/include/pj/config_site_sample.h b/libs/pjproject-1.0.1/pjlib/include/pj/config_site_sample.h similarity index 94% rename from libs/pjproject-1.0/pjlib/include/pj/config_site_sample.h rename to libs/pjproject-1.0.1/pjlib/include/pj/config_site_sample.h index 30c0e37a8443ae0e65f5c73383ae94a12b9cff6a..223a1da624d9e35ed7dfe222cb1d746217f5d2ff 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/config_site_sample.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/config_site_sample.h @@ -73,6 +73,13 @@ # define PJSIP_MAX_PKT_LEN 2000 + /* This is important for Symbian. Symbian lacks vsnprintf(), so + * if the log buffer is not long enough it's possible that + * large incoming packet will corrupt memory when the log tries + * to log the packet. + */ +# define PJ_LOG_MAX_SIZE (PJSIP_MAX_PKT_LEN+500) + /* Since we don't have threads, log buffer can use static buffer */ # define PJ_LOG_USE_STACK_BUFFER 0 diff --git a/libs/pjproject-1.0/pjlib/include/pj/ctype.h b/libs/pjproject-1.0.1/pjlib/include/pj/ctype.h similarity index 96% rename from libs/pjproject-1.0/pjlib/include/pj/ctype.h rename to libs/pjproject-1.0.1/pjlib/include/pj/ctype.h index c755ebaf25123208ea02fca324438d29f0b6b631..abfec7e7c2c3f57c7cc0269db461690658f3d658 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/ctype.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/ctype.h @@ -1,6 +1,7 @@ -/* $Id: ctype.h 2307 2008-09-23 09:11:20Z bennylp $ */ +/* $Id: ctype.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/doxygen.h b/libs/pjproject-1.0.1/pjlib/include/pj/doxygen.h similarity index 99% rename from libs/pjproject-1.0/pjlib/include/pj/doxygen.h rename to libs/pjproject-1.0.1/pjlib/include/pj/doxygen.h index f05a85ea9bc0b0813d33a16aae11e5897e086a12..12014d31fc4109510cd2b2843b27eb76b2664b76 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/doxygen.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/doxygen.h @@ -1,6 +1,7 @@ -/* $Id: doxygen.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: doxygen.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/errno.h b/libs/pjproject-1.0.1/pjlib/include/pj/errno.h similarity index 98% rename from libs/pjproject-1.0/pjlib/include/pj/errno.h rename to libs/pjproject-1.0.1/pjlib/include/pj/errno.h index b8d0b0bb65f55953657dd319680a232cf202ee0a..58ab5c572cbb460ecc7e51f3a165236a2bcd21a6 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/errno.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/errno.h @@ -1,6 +1,7 @@ -/* $Id: errno.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: errno.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/except.h b/libs/pjproject-1.0.1/pjlib/include/pj/except.h similarity index 98% rename from libs/pjproject-1.0/pjlib/include/pj/except.h rename to libs/pjproject-1.0.1/pjlib/include/pj/except.h index 38f7b63baeb326c86d433c902c548344494ef251..066b8f60d3ec7c563ed579995ddef0c9daec3747 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/except.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/except.h @@ -1,6 +1,7 @@ -/* $Id: except.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: except.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/fifobuf.h b/libs/pjproject-1.0.1/pjlib/include/pj/fifobuf.h similarity index 88% rename from libs/pjproject-1.0/pjlib/include/pj/fifobuf.h rename to libs/pjproject-1.0.1/pjlib/include/pj/fifobuf.h index 076a88977e6cfb6d832250c907363615e5490b32..fd7242d47e633605fa8f5b3fdcadd1e173fb908d 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/fifobuf.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/fifobuf.h @@ -1,6 +1,7 @@ -/* $Id: fifobuf.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: fifobuf.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/file_access.h b/libs/pjproject-1.0.1/pjlib/include/pj/file_access.h similarity index 94% rename from libs/pjproject-1.0/pjlib/include/pj/file_access.h rename to libs/pjproject-1.0.1/pjlib/include/pj/file_access.h index 64de90c47190ffb20ea3cb5f1844c1a28bee45fb..8c53755ec4fdd602fe643986cf29d07706bbccf1 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/file_access.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/file_access.h @@ -1,6 +1,7 @@ -/* $Id: file_access.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: file_access.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/file_io.h b/libs/pjproject-1.0.1/pjlib/include/pj/file_io.h similarity index 97% rename from libs/pjproject-1.0/pjlib/include/pj/file_io.h rename to libs/pjproject-1.0.1/pjlib/include/pj/file_io.h index 9a8efaa30942d30a0cc67a200e480479354788c8..ea95c416d9ecd4414ae47dfb9b2fb7c38f5a8ae8 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/file_io.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/file_io.h @@ -1,6 +1,7 @@ -/* $Id: file_io.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: file_io.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/guid.h b/libs/pjproject-1.0.1/pjlib/include/pj/guid.h similarity index 93% rename from libs/pjproject-1.0/pjlib/include/pj/guid.h rename to libs/pjproject-1.0.1/pjlib/include/pj/guid.h index 4ae2e1cb63cd6b316d1b975b149ad5e16da948ae..5302f735ca4ac6ceff5b6a2c91e1ef62b6588c27 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/guid.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/guid.h @@ -1,6 +1,7 @@ -/* $Id: guid.h 2121 2008-07-11 00:56:07Z bennylp $ */ +/* $Id: guid.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/hash.h b/libs/pjproject-1.0.1/pjlib/include/pj/hash.h similarity index 97% rename from libs/pjproject-1.0/pjlib/include/pj/hash.h rename to libs/pjproject-1.0.1/pjlib/include/pj/hash.h index 24676131281db3269daf1cc846dd7030a7cf1f33..72d739dc9ab482ed18649a8f733cd7765413cda9 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/hash.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/hash.h @@ -1,6 +1,7 @@ -/* $Id: hash.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: hash.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/ioqueue.h b/libs/pjproject-1.0.1/pjlib/include/pj/ioqueue.h similarity index 99% rename from libs/pjproject-1.0/pjlib/include/pj/ioqueue.h rename to libs/pjproject-1.0.1/pjlib/include/pj/ioqueue.h index ff9d2c8051ca28ace1aece7d5ae9cbe08d9088e0..ee8baeb2cf40304c27f3bb87e27f7a928a46ab3c 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/ioqueue.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/ioqueue.h @@ -1,7 +1,8 @@ -/* $Id: ioqueue.h 2185 2008-07-29 20:15:15Z bennylp $ +/* $Id: ioqueue.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/ip_helper.h b/libs/pjproject-1.0.1/pjlib/include/pj/ip_helper.h similarity index 93% rename from libs/pjproject-1.0/pjlib/include/pj/ip_helper.h rename to libs/pjproject-1.0.1/pjlib/include/pj/ip_helper.h index 5cf631e11710d458cc9fefed145d6622462dec8b..b1a7ec948d0164d4d88fe5131e2d3d7d9c35ce83 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/ip_helper.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/ip_helper.h @@ -1,6 +1,7 @@ -/* $Id: ip_helper.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ip_helper.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/list.h b/libs/pjproject-1.0.1/pjlib/include/pj/list.h similarity index 97% rename from libs/pjproject-1.0/pjlib/include/pj/list.h rename to libs/pjproject-1.0.1/pjlib/include/pj/list.h index 94c70a4171b50b572bd24eb8d318c5d5db08bde8..2f7e2e8a847d8d71e4fb82220df8d3d3bcc82136 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/list.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/list.h @@ -1,6 +1,7 @@ -/* $Id: list.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: list.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/list_i.h b/libs/pjproject-1.0.1/pjlib/include/pj/list_i.h similarity index 94% rename from libs/pjproject-1.0/pjlib/include/pj/list_i.h rename to libs/pjproject-1.0.1/pjlib/include/pj/list_i.h index a1a206bc02fd4fe54d9cf7a436bf99a6d69b3170..8f5a25abf868593ae5e54be00ca45727d49c15c2 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/list_i.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/list_i.h @@ -1,6 +1,7 @@ -/* $Id: list_i.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: list_i.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/lock.h b/libs/pjproject-1.0.1/pjlib/include/pj/lock.h similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj/lock.h rename to libs/pjproject-1.0.1/pjlib/include/pj/lock.h index 9a7189a11f74d9378431e83792cb63863e0d94ca..13fd7142278c1a1c66f6c65ad71bb4c2b316386a 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/lock.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/lock.h @@ -1,6 +1,7 @@ -/* $Id: lock.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: lock.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/log.h b/libs/pjproject-1.0.1/pjlib/include/pj/log.h similarity index 98% rename from libs/pjproject-1.0/pjlib/include/pj/log.h rename to libs/pjproject-1.0.1/pjlib/include/pj/log.h index d116d27e5f3792ea2b4cf5231394355b77768bc9..37191caabfc3870827ff040e9589b559a953ca83 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/log.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/log.h @@ -1,6 +1,7 @@ -/* $Id: log.h 2181 2008-07-28 21:15:04Z bennylp $ */ +/* $Id: log.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/math.h b/libs/pjproject-1.0.1/pjlib/include/pj/math.h similarity index 97% rename from libs/pjproject-1.0/pjlib/include/pj/math.h rename to libs/pjproject-1.0.1/pjlib/include/pj/math.h index 564fc5d6028d9f918e6541f60f8e1f3e578094b3..93ba2d997782f5785db0684c12f5d54f054e96f2 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/math.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/math.h @@ -1,5 +1,6 @@ -/* $Id: math.h 2263 2008-09-05 13:35:01Z bennylp $ */ +/* $Id: math.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjlib/include/pj/os.h b/libs/pjproject-1.0.1/pjlib/include/pj/os.h similarity index 99% rename from libs/pjproject-1.0/pjlib/include/pj/os.h rename to libs/pjproject-1.0.1/pjlib/include/pj/os.h index 4723418874005e6ad340fa60c0c2f8ec25fc9e04..19c0ad4ba3f916a6f1155a76522b7c6f8c20bb4a 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/os.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/os.h @@ -1,6 +1,7 @@ -/* $Id: os.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/pool.h b/libs/pjproject-1.0.1/pjlib/include/pj/pool.h similarity index 99% rename from libs/pjproject-1.0/pjlib/include/pj/pool.h rename to libs/pjproject-1.0.1/pjlib/include/pj/pool.h index 84d294fd3556f0c94863fb4bcd63c3104a1a7906..d8225cbab90a7d34d799ac763edc75b3be460cfc 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/pool.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/pool.h @@ -1,6 +1,7 @@ -/* $Id: pool.h 2121 2008-07-11 00:56:07Z bennylp $ */ +/* $Id: pool.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/pool_alt.h b/libs/pjproject-1.0.1/pjlib/include/pj/pool_alt.h similarity index 96% rename from libs/pjproject-1.0/pjlib/include/pj/pool_alt.h rename to libs/pjproject-1.0.1/pjlib/include/pj/pool_alt.h index 17ccf6c3f6151ba160465bfa0a5609357c20c75c..417d96dc1bd3b275e4eae90d6b44b6c1295d760a 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/pool_alt.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/pool_alt.h @@ -1,6 +1,7 @@ -/* $Id: pool_alt.h 2341 2008-10-02 22:13:01Z bennylp $ */ +/* $Id: pool_alt.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/pool_buf.h b/libs/pjproject-1.0.1/pjlib/include/pj/pool_buf.h similarity index 94% rename from libs/pjproject-1.0/pjlib/include/pj/pool_buf.h rename to libs/pjproject-1.0.1/pjlib/include/pj/pool_buf.h index 00af8025d0493a7b5903bdb61fe20699c0096099..0698fe26cb6835b58b460d85922f166cec58b62f 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/pool_buf.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/pool_buf.h @@ -1,6 +1,7 @@ -/* $Id: pool_buf.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pool_buf.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/pool_i.h b/libs/pjproject-1.0.1/pjlib/include/pj/pool_i.h similarity index 93% rename from libs/pjproject-1.0/pjlib/include/pj/pool_i.h rename to libs/pjproject-1.0.1/pjlib/include/pj/pool_i.h index d7b69b5deb6481d068e2569404a5fcbe1f5b58d6..1a54be700ca8b8360b6f38cb63d11e3ec20cb2bf 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/pool_i.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/pool_i.h @@ -1,6 +1,7 @@ -/* $Id: pool_i.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pool_i.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/rand.h b/libs/pjproject-1.0.1/pjlib/include/pj/rand.h similarity index 89% rename from libs/pjproject-1.0/pjlib/include/pj/rand.h rename to libs/pjproject-1.0.1/pjlib/include/pj/rand.h index 00e086d749a7effb853c246048d2b1c1306f235e..55169f259765a7ca36d5298ab76853c06d03cae1 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/rand.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/rand.h @@ -1,6 +1,7 @@ -/* $Id: rand.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: rand.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/rbtree.h b/libs/pjproject-1.0.1/pjlib/include/pj/rbtree.h similarity index 97% rename from libs/pjproject-1.0/pjlib/include/pj/rbtree.h rename to libs/pjproject-1.0.1/pjlib/include/pj/rbtree.h index e3763f631cf431bd89f064c9967b8b75dc6de9d0..340409d9b75f487fd89e8c364f9efd3ca2ede058 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/rbtree.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/rbtree.h @@ -1,6 +1,7 @@ -/* $Id: rbtree.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: rbtree.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/sock.h b/libs/pjproject-1.0.1/pjlib/include/pj/sock.h similarity index 99% rename from libs/pjproject-1.0/pjlib/include/pj/sock.h rename to libs/pjproject-1.0.1/pjlib/include/pj/sock.h index 2e77e9d925862749f7604079d28c0f48e02a0ceb..4afb0ec570a63d7af9cec9503fce24ca9e0908ef 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/sock.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/sock.h @@ -1,6 +1,7 @@ -/* $Id: sock.h 2283 2008-09-16 16:11:44Z nanang $ */ +/* $Id: sock.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/sock_select.h b/libs/pjproject-1.0.1/pjlib/include/pj/sock_select.h similarity index 96% rename from libs/pjproject-1.0/pjlib/include/pj/sock_select.h rename to libs/pjproject-1.0.1/pjlib/include/pj/sock_select.h index 2efe38180f0e70c5caf02845383cf346a40ff75c..87158253b1ff526c6dc47a4b87682a8eec6b55c7 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/sock_select.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/sock_select.h @@ -1,6 +1,7 @@ -/* $Id: sock_select.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sock_select.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/string.h b/libs/pjproject-1.0.1/pjlib/include/pj/string.h similarity index 98% rename from libs/pjproject-1.0/pjlib/include/pj/string.h rename to libs/pjproject-1.0.1/pjlib/include/pj/string.h index bb4f64afccfc630812956ee36903c3473dd78190..1516765ab76fd0f8ead47033b7fdb27aab2e42d3 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/string.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/string.h @@ -1,6 +1,7 @@ -/* $Id: string.h 2169 2008-07-23 13:26:33Z bennylp $ */ +/* $Id: string.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/string_i.h b/libs/pjproject-1.0.1/pjlib/include/pj/string_i.h similarity index 97% rename from libs/pjproject-1.0/pjlib/include/pj/string_i.h rename to libs/pjproject-1.0.1/pjlib/include/pj/string_i.h index 3502bf4c245add7bf7f6af1d00a3ddf3953ab321..495a7995735f4a1f3fa69a6d1a52ee1e5bdede71 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/string_i.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/string_i.h @@ -1,6 +1,7 @@ -/* $Id: string_i.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: string_i.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/timer.h b/libs/pjproject-1.0.1/pjlib/include/pj/timer.h similarity index 100% rename from libs/pjproject-1.0/pjlib/include/pj/timer.h rename to libs/pjproject-1.0.1/pjlib/include/pj/timer.h diff --git a/libs/pjproject-1.0/pjlib/include/pj/types.h b/libs/pjproject-1.0.1/pjlib/include/pj/types.h similarity index 98% rename from libs/pjproject-1.0/pjlib/include/pj/types.h rename to libs/pjproject-1.0.1/pjlib/include/pj/types.h index 51571aaba750709d85c960cce9dabce258d17110..9c43f93c8e317bd6d2de6039dd0fc27aa4722cbb 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/types.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/types.h @@ -1,6 +1,7 @@ -/* $Id: types.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: types.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pj/unicode.h b/libs/pjproject-1.0.1/pjlib/include/pj/unicode.h similarity index 95% rename from libs/pjproject-1.0/pjlib/include/pj/unicode.h rename to libs/pjproject-1.0.1/pjlib/include/pj/unicode.h index aaefcc091f07d02e2cf43ec5d302a4d8444244ad..0eea2276a80ba70a398d7a749739a8f76a17af1c 100644 --- a/libs/pjproject-1.0/pjlib/include/pj/unicode.h +++ b/libs/pjproject-1.0.1/pjlib/include/pj/unicode.h @@ -1,6 +1,7 @@ -/* $Id: unicode.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: unicode.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pjlib++.hpp b/libs/pjproject-1.0.1/pjlib/include/pjlib++.hpp similarity index 85% rename from libs/pjproject-1.0/pjlib/include/pjlib++.hpp rename to libs/pjproject-1.0.1/pjlib/include/pjlib++.hpp index e9ca6f61c93376fda424597ce7ef8471f3295b75..fe2e74d0ef1c308e5bf4e180fc3850c724881a0f 100644 --- a/libs/pjproject-1.0/pjlib/include/pjlib++.hpp +++ b/libs/pjproject-1.0.1/pjlib/include/pjlib++.hpp @@ -1,6 +1,7 @@ -/* $Id: pjlib++.hpp 122 2006-01-18 23:32:27Z bennylp $ */ +/* $Id: pjlib++.hpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/include/pjlib.h b/libs/pjproject-1.0.1/pjlib/include/pjlib.h similarity index 89% rename from libs/pjproject-1.0/pjlib/include/pjlib.h rename to libs/pjproject-1.0.1/pjlib/include/pjlib.h index c786b2e50fa955d32a6e21a1a0e5fd7bb564793d..acc12c426b5f324851ed502490de8421debe8ef0 100644 --- a/libs/pjproject-1.0/pjlib/include/pjlib.h +++ b/libs/pjproject-1.0.1/pjlib/include/pjlib.h @@ -1,6 +1,7 @@ -/* $Id: pjlib.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pjlib.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/activesock.c b/libs/pjproject-1.0.1/pjlib/src/pj/activesock.c similarity index 99% rename from libs/pjproject-1.0/pjlib/src/pj/activesock.c rename to libs/pjproject-1.0.1/pjlib/src/pj/activesock.c index d66d5789d198286565b5b4f9d90b0c062270a0b3..3d7451af7b5559082e1a860f6f36a80114fb1c88 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/activesock.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/activesock.c @@ -1,6 +1,7 @@ -/* $Id: activesock.c 2248 2008-08-26 20:47:53Z bennylp $ */ +/* $Id: activesock.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/addr_resolv_linux_kernel.c b/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_linux_kernel.c similarity index 82% rename from libs/pjproject-1.0/pjlib/src/pj/addr_resolv_linux_kernel.c rename to libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_linux_kernel.c index 5735e3d5eae5dcd6179e27afab7f6110611696e6..0848cd54734188a78463fa76b48c643b2b2cc964 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/addr_resolv_linux_kernel.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_linux_kernel.c @@ -1,6 +1,7 @@ -/* $Id: addr_resolv_linux_kernel.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: addr_resolv_linux_kernel.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/addr_resolv_sock.c b/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_sock.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pj/addr_resolv_sock.c rename to libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_sock.c index c65f9fd451bd725a0641be556f98fea99d355b25..bdce279ee348cdccc3acf74eb7417a6cf2c8cd22 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/addr_resolv_sock.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_sock.c @@ -1,6 +1,7 @@ -/* $Id: addr_resolv_sock.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: addr_resolv_sock.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/addr_resolv_symbian.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_symbian.cpp similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pj/addr_resolv_symbian.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_symbian.cpp index 75abee5e1021a68b723fab60643a96cc528d548b..e2b10ee541e7d03213e2925d9f368136099fa6ce 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/addr_resolv_symbian.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: addr_resolv_symbian.cpp 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: addr_resolv_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/array.c b/libs/pjproject-1.0.1/pjlib/src/pj/array.c similarity index 91% rename from libs/pjproject-1.0/pjlib/src/pj/array.c rename to libs/pjproject-1.0.1/pjlib/src/pj/array.c index b88e7cff6192216e60480e240cd953135d0d2eb4..bc47d157b4167ae9804ebe1adbc56b254fabe9f2 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/array.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/array.c @@ -1,6 +1,7 @@ -/* $Id: array.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: array.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/compat/longjmp_i386.S b/libs/pjproject-1.0.1/pjlib/src/pj/compat/longjmp_i386.S similarity index 100% rename from libs/pjproject-1.0/pjlib/src/pj/compat/longjmp_i386.S rename to libs/pjproject-1.0.1/pjlib/src/pj/compat/longjmp_i386.S diff --git a/libs/pjproject-1.0/pjlib/src/pj/compat/setjmp_i386.S b/libs/pjproject-1.0.1/pjlib/src/pj/compat/setjmp_i386.S similarity index 100% rename from libs/pjproject-1.0/pjlib/src/pj/compat/setjmp_i386.S rename to libs/pjproject-1.0.1/pjlib/src/pj/compat/setjmp_i386.S diff --git a/libs/pjproject-1.0/pjlib/src/pj/compat/sigjmp.c b/libs/pjproject-1.0.1/pjlib/src/pj/compat/sigjmp.c similarity index 86% rename from libs/pjproject-1.0/pjlib/src/pj/compat/sigjmp.c rename to libs/pjproject-1.0.1/pjlib/src/pj/compat/sigjmp.c index c1d276c8b43188c176b4792c63316cec352c886c..7dc2eed6e69ac3d2c1168f5a4a78569c14fc29ee 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/compat/sigjmp.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/compat/sigjmp.c @@ -1,6 +1,7 @@ -/* $Id: sigjmp.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sigjmp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/compat/string.c b/libs/pjproject-1.0.1/pjlib/src/pj/compat/string.c similarity index 87% rename from libs/pjproject-1.0/pjlib/src/pj/compat/string.c rename to libs/pjproject-1.0.1/pjlib/src/pj/compat/string.c index ba815c0e37cc3d2f19bc80b11f7cba8956c1628c..ee33e927da49605daacee595e199273bd1d57edf 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/compat/string.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/compat/string.c @@ -1,6 +1,7 @@ -/* $Id: string.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: string.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/compat/string_compat.c b/libs/pjproject-1.0.1/pjlib/src/pj/compat/string_compat.c similarity index 91% rename from libs/pjproject-1.0/pjlib/src/pj/compat/string_compat.c rename to libs/pjproject-1.0.1/pjlib/src/pj/compat/string_compat.c index 03f22cb112936f9dc42234bf305af8bcf0ea9991..3501f3d4736ffa2e1b30d37faf616a13874ddc18 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/compat/string_compat.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/compat/string_compat.c @@ -1,6 +1,7 @@ -/* $Id: string_compat.c 1361 2007-06-11 17:02:52Z bennylp $ */ +/* $Id: string_compat.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/config.c b/libs/pjproject-1.0.1/pjlib/src/pj/config.c similarity index 92% rename from libs/pjproject-1.0/pjlib/src/pj/config.c rename to libs/pjproject-1.0.1/pjlib/src/pj/config.c index c4667d568aa8f9f84929f5b95a50fb4e77ee0362..27c1e13253e61bda3d13d7b1bde1289903e835d0 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/config.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/config.c @@ -1,6 +1,7 @@ -/* $Id: config.c 2348 2008-10-09 14:40:33Z bennylp $ */ +/* $Id: config.c 2396 2008-12-24 10:04:24Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,7 +22,7 @@ #include static const char *id = "config.c"; -PJ_DEF_DATA(const char*) PJ_VERSION = "1.0"; +PJ_DEF_DATA(const char*) PJ_VERSION = "1.0.1"; /* * Get PJLIB version string. @@ -33,7 +34,7 @@ PJ_DEF(const char*) pj_get_version(void) PJ_DEF(void) pj_dump_config(void) { - PJ_LOG(3, (id, "PJLIB (c)2001-2008 Benny Prijono")); + PJ_LOG(3, (id, "PJLIB (c)2008-2009 Teluu Inc.")); PJ_LOG(3, (id, "Dumping configurations:")); PJ_LOG(3, (id, " PJ_VERSION : %s", PJ_VERSION)); PJ_LOG(3, (id, " PJ_M_NAME : %s", PJ_M_NAME)); diff --git a/libs/pjproject-1.0/pjlib/src/pj/ctype.c b/libs/pjproject-1.0.1/pjlib/src/pj/ctype.c similarity index 83% rename from libs/pjproject-1.0/pjlib/src/pj/ctype.c rename to libs/pjproject-1.0.1/pjlib/src/pj/ctype.c index 0dc64c9f529534757df0a38ce7b0f42a73ee4306..d12733765c5d3c446d9f86cb78df98b37ac70274 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ctype.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ctype.c @@ -1,6 +1,7 @@ -/* $Id: ctype.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ctype.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/errno.c b/libs/pjproject-1.0.1/pjlib/src/pj/errno.c similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pj/errno.c rename to libs/pjproject-1.0.1/pjlib/src/pj/errno.c index a31bc7dee6e085e0c2e2b410b8a1c4414317bc26..37a9cfb7ea1949aed359ddce744eefdcbc2b6650 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/errno.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/errno.c @@ -1,6 +1,7 @@ -/* $Id: errno.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: errno.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/except.c b/libs/pjproject-1.0.1/pjlib/src/pj/except.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pj/except.c rename to libs/pjproject-1.0.1/pjlib/src/pj/except.c index acecf1830b585047e721ce6fba51ceea3e8fff09..ad035be62d31c4784bb8f6b166dca4d6fddf264b 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/except.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/except.c @@ -1,6 +1,7 @@ -/* $Id: except.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: except.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/exception_symbian.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/exception_symbian.cpp similarity index 94% rename from libs/pjproject-1.0/pjlib/src/pj/exception_symbian.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/exception_symbian.cpp index 0b9042434f6831e54eed9eaaea242c721f54e8e3..e54cebddf940cd73896ee81e1f59afad48d16d74 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/exception_symbian.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/exception_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: exception_symbian.cpp 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: exception_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/extra-exports.c b/libs/pjproject-1.0.1/pjlib/src/pj/extra-exports.c similarity index 87% rename from libs/pjproject-1.0/pjlib/src/pj/extra-exports.c rename to libs/pjproject-1.0.1/pjlib/src/pj/extra-exports.c index 6ecfa6cacd2b74a0fe8dce2551b660a44b0bd20d..38861d146daed119d96ce8c1402b9a6d4fab43f5 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/extra-exports.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/extra-exports.c @@ -1,6 +1,7 @@ -/* $Id: extra-exports.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: extra-exports.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/fifobuf.c b/libs/pjproject-1.0.1/pjlib/src/pj/fifobuf.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pj/fifobuf.c rename to libs/pjproject-1.0.1/pjlib/src/pj/fifobuf.c index b6fd7a9ce7a8718cd431fb6ba28aabd18ae10392..dfa98c03e9a09f51ad393b90b2925cf11f1348bb 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/fifobuf.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/fifobuf.c @@ -1,6 +1,7 @@ -/* $Id: fifobuf.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: fifobuf.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/file_access_unistd.c b/libs/pjproject-1.0.1/pjlib/src/pj/file_access_unistd.c similarity index 92% rename from libs/pjproject-1.0/pjlib/src/pj/file_access_unistd.c rename to libs/pjproject-1.0.1/pjlib/src/pj/file_access_unistd.c index fa912814199823ced7d1c70f2a13f175ed270aeb..15b20852b6f0dad07e37079fde2a0efd319dad05 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/file_access_unistd.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/file_access_unistd.c @@ -1,6 +1,7 @@ -/* $Id: file_access_unistd.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: file_access_unistd.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/file_access_win32.c b/libs/pjproject-1.0.1/pjlib/src/pj/file_access_win32.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pj/file_access_win32.c rename to libs/pjproject-1.0.1/pjlib/src/pj/file_access_win32.c index 2761a37fcc4c2ca23014b7060c86cce4066ae071..9c5d3dfb4ede8d9e11f7279b281a4ff102f4223c 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/file_access_win32.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/file_access_win32.c @@ -1,6 +1,7 @@ -/* $Id: file_access_win32.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: file_access_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/file_io_ansi.c b/libs/pjproject-1.0.1/pjlib/src/pj/file_io_ansi.c similarity index 95% rename from libs/pjproject-1.0/pjlib/src/pj/file_io_ansi.c rename to libs/pjproject-1.0.1/pjlib/src/pj/file_io_ansi.c index 12607c7671b97a582b15c46afdb8333b886845f7..0e1c989a62dd6ac170969858fd7376377c62c863 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/file_io_ansi.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/file_io_ansi.c @@ -1,6 +1,7 @@ -/* $Id: file_io_ansi.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: file_io_ansi.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/file_io_win32.c b/libs/pjproject-1.0.1/pjlib/src/pj/file_io_win32.c similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pj/file_io_win32.c rename to libs/pjproject-1.0.1/pjlib/src/pj/file_io_win32.c index 8a15836e417389f03c89b20cd1a83da6dbb70e09..82269bc3ed6a6e3784256b4de3ca490dfec1f9d8 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/file_io_win32.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/file_io_win32.c @@ -1,6 +1,7 @@ -/* $Id: file_io_win32.c 2254 2008-08-28 11:19:54Z bennylp $ */ +/* $Id: file_io_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/guid.c b/libs/pjproject-1.0.1/pjlib/src/pj/guid.c similarity index 84% rename from libs/pjproject-1.0/pjlib/src/pj/guid.c rename to libs/pjproject-1.0.1/pjlib/src/pj/guid.c index 7627b764bca534cb68334100c7f62e491d73caa3..b9fc9f421e5101d235c3d8c6244eb4a94d85704f 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/guid.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/guid.c @@ -1,6 +1,7 @@ -/* $Id: guid.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: guid.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/guid_simple.c b/libs/pjproject-1.0.1/pjlib/src/pj/guid_simple.c similarity index 91% rename from libs/pjproject-1.0/pjlib/src/pj/guid_simple.c rename to libs/pjproject-1.0.1/pjlib/src/pj/guid_simple.c index 92d012e4ce8f0c2d3fcc08191a5da34962cd39eb..8c76f9818b9997ac80e2cfbd4c883e2e8fd0910f 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/guid_simple.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/guid_simple.c @@ -1,6 +1,7 @@ -/* $Id: guid_simple.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: guid_simple.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/guid_uuid.c b/libs/pjproject-1.0.1/pjlib/src/pj/guid_uuid.c similarity index 88% rename from libs/pjproject-1.0/pjlib/src/pj/guid_uuid.c rename to libs/pjproject-1.0.1/pjlib/src/pj/guid_uuid.c index 7170b5f6b2c2231d41e653d630009303997649c8..ff1bd6a028ad5d5149a0a1915bd169736e0cb20a 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/guid_uuid.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/guid_uuid.c @@ -1,6 +1,7 @@ -/* $Id: guid_uuid.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: guid_uuid.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/guid_win32.c b/libs/pjproject-1.0.1/pjlib/src/pj/guid_win32.c similarity index 90% rename from libs/pjproject-1.0/pjlib/src/pj/guid_win32.c rename to libs/pjproject-1.0.1/pjlib/src/pj/guid_win32.c index 24e407b41f0a9f6a5396aecc95296156432f390d..89be0ef5c2d5ea6b74b52a407ef83cc9b8b83a60 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/guid_win32.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/guid_win32.c @@ -1,6 +1,7 @@ -/* $Id: guid_win32.c 2140 2008-07-14 17:53:58Z bennylp $ */ +/* $Id: guid_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/hash.c b/libs/pjproject-1.0.1/pjlib/src/pj/hash.c similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pj/hash.c rename to libs/pjproject-1.0.1/pjlib/src/pj/hash.c index 152ac53ab6219f681dee6e1037b69a8b22be1711..2a23cf01df332d8a916c738244b0a84004306832 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/hash.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/hash.c @@ -1,6 +1,7 @@ -/* $Id: hash.c 2138 2008-07-14 16:58:11Z bennylp $ */ +/* $Id: hash.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_common_abs.c b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_common_abs.c similarity index 99% rename from libs/pjproject-1.0/pjlib/src/pj/ioqueue_common_abs.c rename to libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_common_abs.c index 5df6b6efcf13e4757e6d001d03cd5245b5047766..4e1286303a6348695d2a2c4a72709957424dd1f2 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_common_abs.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_common_abs.c @@ -1,6 +1,7 @@ -/* $Id: ioqueue_common_abs.c 2126 2008-07-12 10:09:39Z bennylp $ */ +/* $Id: ioqueue_common_abs.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -41,8 +42,9 @@ static pj_status_t ioqueue_destroy(pj_ioqueue_t *ioqueue) if (ioqueue->auto_delete_lock && ioqueue->lock ) { pj_lock_release(ioqueue->lock); return pj_lock_destroy(ioqueue->lock); - } else - return PJ_SUCCESS; + } + + return PJ_SUCCESS; } /* diff --git a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_common_abs.h b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_common_abs.h similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pj/ioqueue_common_abs.h rename to libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_common_abs.h index 311d7d1c64c4b85a8f78ea0f5182fd39c9263581..4d14a8b843944ac9fc77704ff13aca9b459e95f4 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_common_abs.h +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_common_abs.h @@ -1,6 +1,7 @@ /* $Id */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_dummy.c b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_dummy.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pj/ioqueue_dummy.c rename to libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_dummy.c index 5405a922161e83bae22c9951b0dbd80dec66e3db..3d1e621951df392e575c21c0f7e32c8e823cf7f9 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_dummy.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_dummy.c @@ -1,6 +1,7 @@ -/* $Id: ioqueue_dummy.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ioqueue_dummy.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_epoll.c b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_epoll.c similarity index 99% rename from libs/pjproject-1.0/pjlib/src/pj/ioqueue_epoll.c rename to libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_epoll.c index 8c52189e197d25f4e54e5eb3c53ba401e3b48dca..cd2e786f075794503ca848ad4af4aed142a3ad1b 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_epoll.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_epoll.c @@ -1,6 +1,7 @@ -/* $Id: ioqueue_epoll.c 2308 2008-09-23 09:40:11Z bennylp $ */ +/* $Id: ioqueue_epoll.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_linux_kernel.c b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_linux_kernel.c similarity index 95% rename from libs/pjproject-1.0/pjlib/src/pj/ioqueue_linux_kernel.c rename to libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_linux_kernel.c index 9769ac4a707b145147a43d27c06b9592fb7d5124..7452e2e8d9c0a6ab250aaf2d0b013d95795f36b9 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_linux_kernel.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_linux_kernel.c @@ -1,6 +1,7 @@ -/* $Id: ioqueue_linux_kernel.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ioqueue_linux_kernel.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_select.c b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_select.c similarity index 99% rename from libs/pjproject-1.0/pjlib/src/pj/ioqueue_select.c rename to libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_select.c index 19aac635f4c25fe313f6fcd4519c3545ac972061..e6ed8c1de0f5e45bab5e7cbfc5fa7db32e31fc2a 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_select.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_select.c @@ -1,6 +1,7 @@ -/* $Id: ioqueue_select.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ioqueue_select.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_symbian.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_symbian.cpp similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pj/ioqueue_symbian.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_symbian.cpp index 3d9794d3aaf5c1a56e234f524d612e308f59119d..ec8c1fc5bc47794578acea5ffbf2b9d00b8e4f62 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_symbian.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: ioqueue_symbian.cpp 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ioqueue_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -525,7 +526,7 @@ PJ_DEF(pj_status_t) pj_ioqueue_unregister( pj_ioqueue_key_t *key ) return PJ_SUCCESS; // Cancel pending async object - if (key->cbObj && key->cbObj->IsActive()) { + if (key->cbObj) { key->cbObj->Cancel(); } diff --git a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_winnt.c b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_winnt.c similarity index 99% rename from libs/pjproject-1.0/pjlib/src/pj/ioqueue_winnt.c rename to libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_winnt.c index e6c6e83b3dbc17f9dd445a986681c43cc9b9f206..1d0e7e06fd9a1aa5dd6b7180bf0ec4d42db31f6e 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ioqueue_winnt.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_winnt.c @@ -1,6 +1,7 @@ -/* $Id: ioqueue_winnt.c 2240 2008-08-26 14:41:26Z bennylp $ */ +/* $Id: ioqueue_winnt.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/ip_helper_generic.c b/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_generic.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pj/ip_helper_generic.c rename to libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_generic.c index 40885fad6752ec188645dfd70c03e28a62c079e4..ea67e5d9a0731fe9ce0eab45f5fdabfcfa59c0f0 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ip_helper_generic.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_generic.c @@ -1,6 +1,7 @@ -/* $Id: ip_helper_generic.c 2112 2008-07-07 21:31:02Z bennylp $ */ +/* $Id: ip_helper_generic.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/ip_helper_symbian.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_symbian.cpp similarity index 95% rename from libs/pjproject-1.0/pjlib/src/pj/ip_helper_symbian.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_symbian.cpp index 213a9a14a36266ebcb627cf531c2a454965205af..9f634a0b8b152df42b2736a63ca1a612d8028edb 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ip_helper_symbian.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: ip_helper_symbian.cpp 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ip_helper_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/ip_helper_win32.c b/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_win32.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pj/ip_helper_win32.c rename to libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_win32.c index ca3abf19a4f6723a5b1af45a78b5a80cceba81f7..e02b6027e9071af1094a821f74474c9c966539bc 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/ip_helper_win32.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_win32.c @@ -1,6 +1,7 @@ -/* $Id: ip_helper_win32.c 2112 2008-07-07 21:31:02Z bennylp $ */ +/* $Id: ip_helper_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/list.c b/libs/pjproject-1.0.1/pjlib/src/pj/list.c similarity index 82% rename from libs/pjproject-1.0/pjlib/src/pj/list.c rename to libs/pjproject-1.0.1/pjlib/src/pj/list.c index 0ec2e7c50f04e1351fadcf43d9de160527a49868..4a6bf3e4c03de8465ab9955cb826ea1c5984f0ef 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/list.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/list.c @@ -1,6 +1,7 @@ -/* $Id: list.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: list.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/lock.c b/libs/pjproject-1.0.1/pjlib/src/pj/lock.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pj/lock.c rename to libs/pjproject-1.0.1/pjlib/src/pj/lock.c index b069558b2e122c3dd68db9402f0ac52011233b60..f42291b8e0403bb418e682e8a2150419d280a7f6 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/lock.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/lock.c @@ -1,6 +1,7 @@ -/* $Id: lock.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: lock.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/log.c b/libs/pjproject-1.0.1/pjlib/src/pj/log.c similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pj/log.c rename to libs/pjproject-1.0.1/pjlib/src/pj/log.c index 77a39fc6a1534ae1853e0de25542809675e77132..cfa4942d2ccf54527805bae9a64bb2a9d40d503a 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/log.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/log.c @@ -1,6 +1,7 @@ -/* $Id: log.c 2181 2008-07-28 21:15:04Z bennylp $ */ +/* $Id: log.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/log_writer_printk.c b/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_printk.c similarity index 82% rename from libs/pjproject-1.0/pjlib/src/pj/log_writer_printk.c rename to libs/pjproject-1.0.1/pjlib/src/pj/log_writer_printk.c index 8db4611ccc2c50c751bb600461113bc05fad3e8e..d41d1f9f6be7ecfe7e8ec7c8037b77479703cebd 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/log_writer_printk.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_printk.c @@ -1,6 +1,7 @@ -/* $Id: log_writer_printk.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: log_writer_printk.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/log_writer_stdout.c b/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_stdout.c similarity index 88% rename from libs/pjproject-1.0/pjlib/src/pj/log_writer_stdout.c rename to libs/pjproject-1.0.1/pjlib/src/pj/log_writer_stdout.c index 2c383dfd797bd59ecc804af8ef26fe1c2f5f833e..bed79eab0c3cc16a7da304b8e95dcedb3bd0b71c 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/log_writer_stdout.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_stdout.c @@ -1,6 +1,7 @@ -/* $Id: log_writer_stdout.c 2159 2008-07-19 17:53:47Z bennylp $ */ +/* $Id: log_writer_stdout.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/log_writer_symbian_console.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_symbian_console.cpp similarity index 87% rename from libs/pjproject-1.0/pjlib/src/pj/log_writer_symbian_console.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/log_writer_symbian_console.cpp index aef3fdeef5908184b532251a5b4447e275c41115..8f627cf149067127f7bf0402c0268f77f748361d 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/log_writer_symbian_console.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_symbian_console.cpp @@ -1,6 +1,7 @@ -/* $Id: log_writer_symbian_console.cpp 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: log_writer_symbian_console.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_core_linux_kernel.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_core_linux_kernel.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pj/os_core_linux_kernel.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_core_linux_kernel.c index f83aa359f89593ea8d5e369047f3f32e0671829b..d953397dc7b553307e326465181a239dfc9572b1 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_core_linux_kernel.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_core_linux_kernel.c @@ -1,6 +1,7 @@ -/* $Id: os_core_linux_kernel.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_core_linux_kernel.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_core_symbian.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/os_core_symbian.cpp similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pj/os_core_symbian.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/os_core_symbian.cpp index 5f998a367be95687e51f2293ee98c85f04f8ddcd..f9037498965c761ba4f6e0c564357e55d56c552b 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_core_symbian.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_core_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: os_core_symbian.cpp 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_core_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -89,8 +90,7 @@ CPjTimeoutTimer::CPjTimeoutTimer() CPjTimeoutTimer::~CPjTimeoutTimer() { - if (IsActive()) - Cancel(); + Cancel(); timer_.Close(); } @@ -115,8 +115,7 @@ CPjTimeoutTimer *CPjTimeoutTimer::NewL() void CPjTimeoutTimer::StartTimer(TUint miliSeconds) { - if (IsActive()) - Cancel(); + Cancel(); hasTimedOut_ = PJ_FALSE; timer_.After(iStatus, miliSeconds * 1000); @@ -329,7 +328,7 @@ PJ_DEF(pj_status_t) pj_init(void) TInt err; err = os->Initialize(); if (err != KErrNone) - return status; + return PJ_RETURN_OS_ERROR(err); /* Initialize exception ID for the pool. * Must do so after critical section is configured. @@ -452,7 +451,7 @@ PJ_DEF(pj_bool_t) pj_symbianos_poll(int priority, int ms_timeout) CPollTimeoutTimer *timer = NULL; if (priority==-1) - priority = CActive::EPriorityStandard; + priority = EPriorityNull; if (ms_timeout >= 0) { timer = CPollTimeoutTimer::NewL(ms_timeout, priority); @@ -463,8 +462,7 @@ PJ_DEF(pj_bool_t) pj_symbianos_poll(int priority, int ms_timeout) if (timer) { bool timer_is_active = timer->IsActive(); - if (timer_is_active) - timer->Cancel(); + timer->Cancel(); delete timer; @@ -622,11 +620,7 @@ PJ_DEF(pj_status_t) pj_thread_destroy(pj_thread_t *rec) PJ_DEF(pj_status_t) pj_thread_sleep(unsigned msec) { User::After(msec*1000); - - TInt aError; - while (CActiveScheduler::RunIfReady(aError, EPriorityMuchLess)) - ; - + return PJ_SUCCESS; } diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_core_unix.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_core_unix.c similarity index 99% rename from libs/pjproject-1.0/pjlib/src/pj/os_core_unix.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_core_unix.c index 60974238acda9062257d55648dc2fc71607755cd..a9de199526d7dec64cd4d363aecbfe5dc2544c82 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_core_unix.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_core_unix.c @@ -1,6 +1,7 @@ -/* $Id: os_core_unix.c 2217 2008-08-15 14:53:18Z bennylp $ */ +/* $Id: os_core_unix.c 2395 2008-12-24 09:17:08Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1087,6 +1088,13 @@ static pj_status_t init_mutex(pj_mutex_t *mutex, const char *name, int type) return PJ_RETURN_OS_ERROR(rc); } + rc = pthread_mutexattr_destroy(&attr); + if (rc != 0) { + pj_status_t status = PJ_RETURN_OS_ERROR(rc); + pthread_mutex_destroy(&mutex->mutex); + return status; + } + #if PJ_DEBUG /* Set owner. */ mutex->nesting_level = 0; diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_core_win32.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_core_win32.c similarity index 99% rename from libs/pjproject-1.0/pjlib/src/pj/os_core_win32.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_core_win32.c index a28f508f66518eeed085db5edf00b90e3f6372a5..ad90cf550f5a75a9db08689544177bfe00582e49 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_core_win32.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_core_win32.c @@ -1,6 +1,7 @@ -/* $Id: os_core_win32.c 2132 2008-07-13 14:57:22Z bennylp $ */ +/* $Id: os_core_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_error_linux_kernel.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_error_linux_kernel.c similarity index 90% rename from libs/pjproject-1.0/pjlib/src/pj/os_error_linux_kernel.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_error_linux_kernel.c index d2e71ba498be2aae42a62839d9bff52d2eefe7a0..f0a39754020c6f5449d1ad7a6f366012c576c2dd 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_error_linux_kernel.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_error_linux_kernel.c @@ -1,6 +1,7 @@ -/* $Id: os_error_linux_kernel.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_error_linux_kernel.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_error_symbian.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/os_error_symbian.cpp similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pj/os_error_symbian.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/os_error_symbian.cpp index 287bd8c5407f9c3dcbe211c4c539b1b9a684f430..31707b97c377903df1c5561cdbcda4101e5b935c 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_error_symbian.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_error_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: os_error_symbian.cpp 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_error_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_error_unix.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_error_unix.c similarity index 90% rename from libs/pjproject-1.0/pjlib/src/pj/os_error_unix.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_error_unix.c index 4e8ab31e6addff19b1353013158a3afd2c4cdef3..45d59d92ebd2e7ed20ef5bec183f758dcbc14385 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_error_unix.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_error_unix.c @@ -1,6 +1,7 @@ -/* $Id: os_error_unix.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_error_unix.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_error_win32.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_error_win32.c similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pj/os_error_win32.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_error_win32.c index 891f9fe49db8677f18e7be5028680f19e80becc0..87582d5a393c40eb4a907a907ab95389bba54435 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_error_win32.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_error_win32.c @@ -1,6 +1,7 @@ -/* $Id: os_error_win32.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_error_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_rwmutex.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_rwmutex.c similarity index 95% rename from libs/pjproject-1.0/pjlib/src/pj/os_rwmutex.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_rwmutex.c index 662c5d77d5c6cb7a9b796519bc34a5befb9f410c..13d0c54e59fdf22bf13c38c7b2957c1417de71eb 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_rwmutex.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_rwmutex.c @@ -1,6 +1,7 @@ -/* $Id: os_rwmutex.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_rwmutex.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_symbian.h b/libs/pjproject-1.0.1/pjlib/src/pj/os_symbian.h similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pj/os_symbian.h rename to libs/pjproject-1.0.1/pjlib/src/pj/os_symbian.h index b27ba51776299b59c6605e0bb545740378dd4d43..f7f722bbb9b55cbc45e0e3fb82ebf552f8d423e7 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_symbian.h +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_symbian.h @@ -1,6 +1,7 @@ -/* $Id: os_symbian.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_symbian.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -347,7 +348,7 @@ public: void WaitForActiveObjects(TInt aPriority = CActive::EPriorityStandard) { TInt aError; - User::WaitForAnyRequest(); + CActiveScheduler::Current()->WaitForAnyRequest(); CActiveScheduler::RunIfReady(aError, aPriority); } diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_time_bsd.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_time_bsd.c similarity index 85% rename from libs/pjproject-1.0/pjlib/src/pj/os_time_bsd.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_time_bsd.c index 54d2205edb69855f32ddadc96f0842e3e58bb5a5..e24174045900b14e204d76369b6ee032e5f056bc 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_time_bsd.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_time_bsd.c @@ -1,6 +1,7 @@ -/* $Id: os_time_bsd.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_time_bsd.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_time_common.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_time_common.c similarity index 91% rename from libs/pjproject-1.0/pjlib/src/pj/os_time_common.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_time_common.c index 8b732f5e0f7f5204f738d8c6d92cf89581e61aef..241771cf457b798c54c82d5e12096538b1c790fc 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_time_common.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_time_common.c @@ -1,6 +1,7 @@ -/* $Id: os_time_common.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_time_common.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_time_linux_kernel.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_time_linux_kernel.c similarity index 89% rename from libs/pjproject-1.0/pjlib/src/pj/os_time_linux_kernel.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_time_linux_kernel.c index 65767b0be325bd812c8168b62fc94f9ef241db44..481bd51bc0871e86102d3d47b736267cc2047431 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_time_linux_kernel.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_time_linux_kernel.c @@ -1,6 +1,7 @@ -/* $Id: os_time_linux_kernel.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_time_linux_kernel.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_time_unix.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_time_unix.c similarity index 87% rename from libs/pjproject-1.0/pjlib/src/pj/os_time_unix.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_time_unix.c index 7f5d6ba4f5604c279e3992fc6a82a788080f07a4..5669ef598fc16b41946d1c5e0423b600b25bf1ec 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_time_unix.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_time_unix.c @@ -1,6 +1,7 @@ -/* $Id: os_time_unix.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_time_unix.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_time_win32.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_time_win32.c similarity index 94% rename from libs/pjproject-1.0/pjlib/src/pj/os_time_win32.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_time_win32.c index 8a44ec3d0b8fa4f2086b0c12eb68afcea695cf9c..5b9af57ebccad704e4c1bdcda9d973de4ef724b4 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_time_win32.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_time_win32.c @@ -1,6 +1,7 @@ -/* $Id: os_time_win32.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_time_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_timestamp_common.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_common.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pj/os_timestamp_common.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_common.c index 2552477feb1c2249ef00d993b89486f234e8c2c3..6262a1993fa4d57caacde071209c1dc55b428035 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_timestamp_common.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_common.c @@ -1,6 +1,7 @@ -/* $Id: os_timestamp_common.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_timestamp_common.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_timestamp_linux_kernel.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_linux_kernel.c similarity index 90% rename from libs/pjproject-1.0/pjlib/src/pj/os_timestamp_linux_kernel.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_linux_kernel.c index b772538ac580e2cc9610b25160c5fd7ef436d4f1..efd72211177b52bdb35b6fbcd73f236928ae29e2 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_timestamp_linux_kernel.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_linux_kernel.c @@ -1,6 +1,7 @@ -/* $Id: os_timestamp_linux_kernel.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_timestamp_linux_kernel.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_timestamp_posix.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_posix.c similarity index 94% rename from libs/pjproject-1.0/pjlib/src/pj/os_timestamp_posix.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_posix.c index 589d1350c9081b6b2c4a17c7820a4af32e196bbb..d9b5d20e0e6c245294559c6cd797c1488bf5e6ed 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_timestamp_posix.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_posix.c @@ -1,6 +1,7 @@ -/* $Id: os_timestamp_posix.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_timestamp_posix.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/os_timestamp_win32.c b/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_win32.c similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pj/os_timestamp_win32.c rename to libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_win32.c index ba7aa4bdf08f5631dd9d521bdd8025753e57bea3..b74cedb6c42659c49a797b306cc46a942f2c6258 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/os_timestamp_win32.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_win32.c @@ -1,6 +1,7 @@ -/* $Id: os_timestamp_win32.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os_timestamp_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/pool.c b/libs/pjproject-1.0.1/pjlib/src/pj/pool.c similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pj/pool.c rename to libs/pjproject-1.0.1/pjlib/src/pj/pool.c index b2fe0109f143e80b473996fff4fba0ee8f15f48d..7c1e5564b27660549dad71bee4110c1fac3df975 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/pool.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/pool.c @@ -1,6 +1,7 @@ -/* $Id: pool.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pool.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/pool_buf.c b/libs/pjproject-1.0.1/pjlib/src/pj/pool_buf.c similarity index 93% rename from libs/pjproject-1.0/pjlib/src/pj/pool_buf.c rename to libs/pjproject-1.0.1/pjlib/src/pj/pool_buf.c index 0b7449d662e40d9c47abf671c09264a95f87058c..f60333669a6a203dcf8d212ac6548b9236b19171 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/pool_buf.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/pool_buf.c @@ -1,6 +1,7 @@ -/* $Id: pool_buf.c 2123 2008-07-12 09:31:34Z bennylp $ */ +/* $Id: pool_buf.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/pool_caching.c b/libs/pjproject-1.0.1/pjlib/src/pj/pool_caching.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pj/pool_caching.c rename to libs/pjproject-1.0.1/pjlib/src/pj/pool_caching.c index 2a8b9cad2fdaf906fa0896350b5cf33160f68063..1582ed0b3ed6b37ec77ebd973a9eba9d694562e3 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/pool_caching.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/pool_caching.c @@ -1,6 +1,7 @@ -/* $Id: pool_caching.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pool_caching.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/pool_dbg.c b/libs/pjproject-1.0.1/pjlib/src/pj/pool_dbg.c similarity index 95% rename from libs/pjproject-1.0/pjlib/src/pj/pool_dbg.c rename to libs/pjproject-1.0.1/pjlib/src/pj/pool_dbg.c index d60c96e60b555b9f07e215159385b4c4c0686d21..ac8b8d17482c1e9ef42cd43de898fcfa2fe849cc 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/pool_dbg.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/pool_dbg.c @@ -1,6 +1,7 @@ -/* $Id: pool_dbg.c 2123 2008-07-12 09:31:34Z bennylp $ */ +/* $Id: pool_dbg.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/pool_policy_kmalloc.c b/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_kmalloc.c similarity index 89% rename from libs/pjproject-1.0/pjlib/src/pj/pool_policy_kmalloc.c rename to libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_kmalloc.c index 60d7dfb2938bb24e96569d06c75947b12bc3dd90..c7feb33b95f8f530cd10118f3f24da3032185c35 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/pool_policy_kmalloc.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_kmalloc.c @@ -1,6 +1,7 @@ -/* $Id: pool_policy_kmalloc.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pool_policy_kmalloc.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/pool_policy_malloc.c b/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_malloc.c similarity index 92% rename from libs/pjproject-1.0/pjlib/src/pj/pool_policy_malloc.c rename to libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_malloc.c index 0042b583e1932fa8ccb1375eab7fc8fec9c0a56d..e4cb542ad94b217b91921e0315b7e8d2cfd2be21 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/pool_policy_malloc.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_malloc.c @@ -1,6 +1,7 @@ -/* $Id: pool_policy_malloc.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pool_policy_malloc.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/pool_policy_new.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_new.cpp similarity index 92% rename from libs/pjproject-1.0/pjlib/src/pj/pool_policy_new.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_new.cpp index f1c717e5eeebf4a892b4418f978ea7c36396a452..e22040a2f42be5a2f401f2a8a9b3dffd6c305919 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/pool_policy_new.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_new.cpp @@ -1,6 +1,7 @@ -/* $Id: pool_policy_new.cpp 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pool_policy_new.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/pool_signature.h b/libs/pjproject-1.0.1/pjlib/src/pj/pool_signature.h similarity index 91% rename from libs/pjproject-1.0/pjlib/src/pj/pool_signature.h rename to libs/pjproject-1.0.1/pjlib/src/pj/pool_signature.h index 57250fd0111c5bf8d47ffe9fe6378835abf39667..11e6a18f2ea99a136218c1c50601d62293c8c77c 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/pool_signature.h +++ b/libs/pjproject-1.0.1/pjlib/src/pj/pool_signature.h @@ -1,6 +1,7 @@ -/* $Id: pool_signature.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pool_signature.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/rand.c b/libs/pjproject-1.0.1/pjlib/src/pj/rand.c similarity index 84% rename from libs/pjproject-1.0/pjlib/src/pj/rand.c rename to libs/pjproject-1.0.1/pjlib/src/pj/rand.c index 7391a83bf31f176dc72a1c8f7d330eb86aea7c08..62d94a087fde55836525316242e4a6215ce548f2 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/rand.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/rand.c @@ -1,6 +1,7 @@ -/* $Id: rand.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: rand.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/rbtree.c b/libs/pjproject-1.0.1/pjlib/src/pj/rbtree.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pj/rbtree.c rename to libs/pjproject-1.0.1/pjlib/src/pj/rbtree.c index cd812afaed85848f7fc7629d742dacd95b971fb3..519ea00cb7d43a8ea63ae3afd50d149963a66706 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/rbtree.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/rbtree.c @@ -1,6 +1,7 @@ -/* $Id: rbtree.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: rbtree.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/sock_bsd.c b/libs/pjproject-1.0.1/pjlib/src/pj/sock_bsd.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pj/sock_bsd.c rename to libs/pjproject-1.0.1/pjlib/src/pj/sock_bsd.c index 2b20b89b2dc856a480fd60dd90158ec8458ec0f3..93f2511a2acf07ef61eccf1e2f34bde9ba637557 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/sock_bsd.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/sock_bsd.c @@ -1,6 +1,7 @@ -/* $Id: sock_bsd.c 2331 2008-09-27 13:16:35Z bennylp $ */ +/* $Id: sock_bsd.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -288,6 +289,10 @@ PJ_DEF(pj_status_t) pj_inet_pton(int af, const pj_str_t *src, void *dst) PJ_STRING_TO_NATIVE(tempaddr,wtempaddr,sizeof(wtempaddr)), af, NULL, (LPSOCKADDR)&sock_addr, &addr_len); if (rc != 0) { + /* If you get rc 130022 Invalid argument (WSAEINVAL) with IPv6, + * check that you have IPv6 enabled (install it in the network + * adapter). + */ pj_status_t status = pj_get_netos_error(); if (status == PJ_SUCCESS) status = PJ_EUNKNOWN; diff --git a/libs/pjproject-1.0/pjlib/src/pj/sock_common.c b/libs/pjproject-1.0.1/pjlib/src/pj/sock_common.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pj/sock_common.c rename to libs/pjproject-1.0.1/pjlib/src/pj/sock_common.c index 3767f7d0876f25504d7a89ffaf8231186a815200..4eda8e6cb8888b352c8df2dcf8911621bbe3aef0 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/sock_common.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/sock_common.c @@ -1,6 +1,7 @@ -/* $Id: sock_common.c 2283 2008-09-16 16:11:44Z nanang $ */ +/* $Id: sock_common.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/sock_linux_kernel.c b/libs/pjproject-1.0.1/pjlib/src/pj/sock_linux_kernel.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pj/sock_linux_kernel.c rename to libs/pjproject-1.0.1/pjlib/src/pj/sock_linux_kernel.c index 66d92dedd13f481454684786a946e97e0b0d7941..74c2a011a8da2d6af67b081b76a7b7a56028deab 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/sock_linux_kernel.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/sock_linux_kernel.c @@ -1,6 +1,7 @@ -/* $Id: sock_linux_kernel.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sock_linux_kernel.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/sock_select.c b/libs/pjproject-1.0.1/pjlib/src/pj/sock_select.c similarity index 94% rename from libs/pjproject-1.0/pjlib/src/pj/sock_select.c rename to libs/pjproject-1.0.1/pjlib/src/pj/sock_select.c index cc871d636c2940dce4f991508d72472e1cff787c..628baccbb5c86c2229ce43f6fdb25f32787c99af 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/sock_select.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/sock_select.c @@ -1,6 +1,7 @@ -/* $Id: sock_select.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sock_select.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/sock_select_symbian.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/sock_select_symbian.cpp similarity index 95% rename from libs/pjproject-1.0/pjlib/src/pj/sock_select_symbian.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/sock_select_symbian.cpp index 7bee5637353df441568a943840c789f879d5b9ae..727bcfdf8b3783a3e984f2804c642d3ab86a37cb 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/sock_select_symbian.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/sock_select_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: sock_select_symbian.cpp 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sock_select_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/sock_symbian.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/sock_symbian.cpp similarity index 99% rename from libs/pjproject-1.0/pjlib/src/pj/sock_symbian.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/sock_symbian.cpp index 9ff1eea7ac9386685100f664c3f6953f5ba9e14e..8b4765f896ef8441b8b41becdc6109cf1dc75c47 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/sock_symbian.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/sock_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: sock_symbian.cpp 2327 2008-09-27 09:35:34Z bennylp $ */ +/* $Id: sock_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -101,8 +102,7 @@ CPjSocketReader *CPjSocket::CreateReader(unsigned max_len) void CPjSocket::DestroyReader() { if (sockReader_) { - if (sockReader_->IsActive()) - sockReader_->Cancel(); + sockReader_->Cancel(); delete sockReader_; sockReader_ = NULL; } diff --git a/libs/pjproject-1.0/pjlib/src/pj/string.c b/libs/pjproject-1.0.1/pjlib/src/pj/string.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pj/string.c rename to libs/pjproject-1.0.1/pjlib/src/pj/string.c index 1979cb3ef5e7e82fc09efb8a52fa811c97545b4a..5169eccc62bdcb29bfb288785bc97d11e6649458 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/string.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/string.c @@ -1,6 +1,7 @@ -/* $Id: string.c 2169 2008-07-23 13:26:33Z bennylp $ */ +/* $Id: string.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/symbols.c b/libs/pjproject-1.0.1/pjlib/src/pj/symbols.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pj/symbols.c rename to libs/pjproject-1.0.1/pjlib/src/pj/symbols.c index ae7f0dd2029c0b02c848a147c60664ecf28d8ab0..02e96c772eb9fe6d4f9d26ea40cff64b59ed2c88 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/symbols.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/symbols.c @@ -1,6 +1,7 @@ -/* $Id: symbols.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: symbols.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/timer.c b/libs/pjproject-1.0.1/pjlib/src/pj/timer.c similarity index 100% rename from libs/pjproject-1.0/pjlib/src/pj/timer.c rename to libs/pjproject-1.0.1/pjlib/src/pj/timer.c diff --git a/libs/pjproject-1.0/pjlib/src/pj/timer_symbian.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/timer_symbian.cpp similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pj/timer_symbian.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/timer_symbian.cpp index 5229a68d9aad55ba8e19d14c92be3ec25206475f..0a9dd8a9377941880e097e731889eacf6b2f416f 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/timer_symbian.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/timer_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: timer_symbian.cpp 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: timer_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -78,8 +79,7 @@ CPjTimerEntry::CPjTimerEntry(pj_timer_heap_t *timer_heap, CPjTimerEntry::~CPjTimerEntry() { - if (IsActive()) - Cancel(); + Cancel(); rtimer_.Close(); } diff --git a/libs/pjproject-1.0/pjlib/src/pj/types.c b/libs/pjproject-1.0.1/pjlib/src/pj/types.c similarity index 87% rename from libs/pjproject-1.0/pjlib/src/pj/types.c rename to libs/pjproject-1.0.1/pjlib/src/pj/types.c index 8fcc59728710f48b683e3d4ce9c779d9f708d1ac..310946137f9e63c062642bba7e94e2088636edbd 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/types.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/types.c @@ -1,6 +1,7 @@ -/* $Id: types.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: types.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/unicode_symbian.cpp b/libs/pjproject-1.0.1/pjlib/src/pj/unicode_symbian.cpp similarity index 90% rename from libs/pjproject-1.0/pjlib/src/pj/unicode_symbian.cpp rename to libs/pjproject-1.0.1/pjlib/src/pj/unicode_symbian.cpp index 42bd448300638b07e8da7c45c9abd55f9eacd7d8..e9eb957f957693b1c4dd8b6e54de19feb87495fd 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/unicode_symbian.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pj/unicode_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: unicode_symbian.cpp 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: unicode_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pj/unicode_win32.c b/libs/pjproject-1.0.1/pjlib/src/pj/unicode_win32.c similarity index 87% rename from libs/pjproject-1.0/pjlib/src/pj/unicode_win32.c rename to libs/pjproject-1.0.1/pjlib/src/pj/unicode_win32.c index 15eaf62a956a38b9ad27555f34e64e9ee5c89365..3153a09bf6724e5454095872beb6c90ca961a956 100644 --- a/libs/pjproject-1.0/pjlib/src/pj/unicode_win32.c +++ b/libs/pjproject-1.0.1/pjlib/src/pj/unicode_win32.c @@ -1,6 +1,7 @@ -/* $Id: unicode_win32.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: unicode_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib++-test/main.cpp b/libs/pjproject-1.0.1/pjlib/src/pjlib++-test/main.cpp similarity index 93% rename from libs/pjproject-1.0/pjlib/src/pjlib++-test/main.cpp rename to libs/pjproject-1.0.1/pjlib/src/pjlib++-test/main.cpp index 6ba356d46ec4cd4ccb44f75a1c5569010dde64fb..6b749ad62dfba137f30cd89cc30c0d60113ab5e4 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib++-test/main.cpp +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib++-test/main.cpp @@ -1,6 +1,7 @@ /* $Id */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-samples/except.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/except.c similarity index 91% rename from libs/pjproject-1.0/pjlib/src/pjlib-samples/except.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-samples/except.c index 9f6533c5ea603eaac1d6ce4f1ebccb92ceccc416..7e2926616ea60c05348e092ef73e346b922c96d2 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-samples/except.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/except.c @@ -1,6 +1,7 @@ -/* $Id: except.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: except.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-samples/list.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/list.c similarity index 91% rename from libs/pjproject-1.0/pjlib/src/pjlib-samples/list.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-samples/list.c index cfac0f0284b43aa405da6d890ac57e3429f6a619..c573213608d102c95cbd4a4974794c52a13eac90 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-samples/list.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/list.c @@ -1,6 +1,7 @@ -/* $Id: list.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: list.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-samples/log.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/log.c similarity index 86% rename from libs/pjproject-1.0/pjlib/src/pjlib-samples/log.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-samples/log.c index 6eb23258fb44fc0239f04de3b35441734b2b31ac..8ad149985ec3e6f7fec9447efefaea0a7b743ddd 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-samples/log.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/log.c @@ -1,6 +1,7 @@ -/* $Id: log.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: log.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/activesock.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/activesock.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/activesock.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/activesock.c index 5cf0173f84df43ff5086f535accd3b07d74e3616..770493b1531efd9e2dfe1c5094876658d19b1231 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/activesock.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/activesock.c @@ -1,6 +1,7 @@ -/* $Id: activesock.c 2251 2008-08-28 10:41:29Z bennylp $ */ +/* $Id: activesock.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/atomic.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/atomic.c similarity index 93% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/atomic.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/atomic.c index c53db39efa78590be57528d49a488fb078be34e1..3fad0bed7c4c774340ea83643307165a4401ef74 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/atomic.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/atomic.c @@ -1,6 +1,7 @@ -/* $Id: atomic.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: atomic.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/echo_clt.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/echo_clt.c similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/echo_clt.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/echo_clt.c index 8a5c0d4ec0dd82c0a541968377ff2894a1b4136c..84bf686d7847093fc7b888ced537cc5a94eb8f33 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/echo_clt.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/echo_clt.c @@ -1,6 +1,7 @@ -/* $Id: echo_clt.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: echo_clt.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/errno.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/errno.c similarity index 95% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/errno.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/errno.c index 22f426c0586808ff7dd9194bfd2ed52d243c82ae..c0c5865f1aa78e9565beb39c38693718d46bfc1f 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/errno.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/errno.c @@ -1,6 +1,7 @@ -/* $Id: errno.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: errno.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/exception.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/exception.c similarity index 94% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/exception.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/exception.c index 1c15138dafff436490b74dc5283c175e9ff5685e..dfbc638cfc363bd4b4aa88b83289e7dd69255911 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/exception.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/exception.c @@ -1,6 +1,7 @@ -/* $Id: exception.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: exception.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/fifobuf.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/fifobuf.c similarity index 93% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/fifobuf.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/fifobuf.c index 9868fc00f52109a7c5499e7ca10505c6979be021..ce5978ed5165398a826e5b5ddb16e6e71b93c07d 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/fifobuf.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/fifobuf.c @@ -1,6 +1,7 @@ -/* $Id: fifobuf.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: fifobuf.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/file.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/file.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/file.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/file.c index aedd681bbe68acd835dd2544ad2ef9fbdbf01d37..9ec6f37b023e9b8b1b44ed1faa3c0ba39110586c 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/file.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/file.c @@ -1,6 +1,7 @@ -/* $Id: file.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: file.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/hash_test.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/hash_test.c similarity index 94% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/hash_test.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/hash_test.c index c29acb9da74b1d76d4ae88172ad761fe06478919..73aca4007fa2dc08a5d047425187219490fc5def 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/hash_test.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/hash_test.c @@ -1,6 +1,7 @@ -/* $Id: hash_test.c 2138 2008-07-14 16:58:11Z bennylp $ */ +/* $Id: hash_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_perf.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_perf.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_perf.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_perf.c index 18e76176e57bb93bc0aba938ff79a80f4d786995..bbbce560ac70fdcd1ef4982f22b13e9f35776ade 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_perf.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_perf.c @@ -1,6 +1,7 @@ -/* $Id: ioq_perf.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ioq_perf.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_tcp.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_tcp.c similarity index 99% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_tcp.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_tcp.c index 032d7daba5d3f5cfbc685ac43641ebb93501f492..bf7f7f5b73ee10af79b0e456d0886014c4ac26d1 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_tcp.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_tcp.c @@ -1,6 +1,7 @@ -/* $Id: ioq_tcp.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ioq_tcp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_udp.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_udp.c similarity index 99% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_udp.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_udp.c index 49c9af3d338eebac2b011ee191fb540abfdf7c5e..e9139bcf63e0aad562284b38e2e6337bcd219f85 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_udp.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_udp.c @@ -1,6 +1,7 @@ -/* $Id: ioq_udp.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ioq_udp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_unreg.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_unreg.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_unreg.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_unreg.c index bfc6c9368d19bcd2db6f1a7173da83e223452dc0..95cfce7f66101c1910e1dbbb8cafc01e80ee6acf 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/ioq_unreg.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_unreg.c @@ -1,6 +1,7 @@ -/* $Id: ioq_unreg.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ioq_unreg.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/list.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/list.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/list.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/list.c index 89512b163f775fc330e463f70171c112c0189ba1..e5509d55b3f1c2c253c521fc190958a037dffa26 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/list.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/list.c @@ -1,6 +1,7 @@ -/* $Id: list.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: list.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/main.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main.c similarity index 93% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/main.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/main.c index 8ad001fe3367ec6fc534e9b3e1511a417d61075c..ae175407c70ae9646bf17212ce2567167866a4af 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/main.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main.c @@ -1,6 +1,7 @@ -/* $Id: main.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/main_mod.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_mod.c similarity index 86% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/main_mod.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_mod.c index dc5b97fcaff7b354d27ee732e3c49414df5b224d..81a87dc96f5010ac1589494f048a79c9fe86e02a 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/main_mod.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_mod.c @@ -1,6 +1,7 @@ -/* $Id: main_mod.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: main_mod.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/main_rtems.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_rtems.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/main_rtems.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_rtems.c index dc2e5ad3c5dadd3fb84c081045b599db50632285..828a38d8c9c1e834c9b899f1d36ad47169c21d24 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/main_rtems.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_rtems.c @@ -1,6 +1,7 @@ -/* $Id: main_rtems.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: main_rtems.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/main_symbian.cpp b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_symbian.cpp similarity index 100% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/main_symbian.cpp rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_symbian.cpp diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/main_win32.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_win32.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/main_win32.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_win32.c index fbf9892166156aea506425ec853b278cff01b97d..a1bb77d1f0e3626e458e48c2e242d04f3c82f902 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/main_win32.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_win32.c @@ -1,6 +1,7 @@ -/* $Id: main_win32.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: main_win32.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/mutex.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/mutex.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/mutex.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/mutex.c index 0b53aceb2bd313f7b2ee1f2947fe249634107fb1..80fce7c3084550836db9910e9f18a12fbaebbab2 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/mutex.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/mutex.c @@ -1,6 +1,7 @@ -/* $Id: mutex.c 2217 2008-08-15 14:53:18Z bennylp $ */ +/* $Id: mutex.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/os.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/os.c similarity index 81% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/os.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/os.c index 2da0777dcd93ebca3630b709b517bde53080ee30..f19a6bfa6dc84dc60c8497ce9ed75e560a98ee2c 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/os.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/os.c @@ -1,6 +1,7 @@ -/* $Id: os.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: os.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/pool.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/pool.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/pool.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/pool.c index 3eb3efd1515447d252c6dfaf988ccd317a1e5697..417aa3bb4ad8e08741b9b551906af2a9edd18bb2 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/pool.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/pool.c @@ -1,6 +1,7 @@ -/* $Id: pool.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pool.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/pool_perf.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/pool_perf.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/pool_perf.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/pool_perf.c index 76c1e54a09a898ca2db634a2b52fc204a3a575cf..fe9967fe7ccd06ba2c16e96c933f63908a889c5f 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/pool_perf.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/pool_perf.c @@ -1,6 +1,7 @@ -/* $Id: pool_perf.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pool_perf.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/rand.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rand.c similarity index 88% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/rand.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/rand.c index 333f68232d08e4e9b80de301bfe340592ab1b002..404a41be0282691df601a1ea9a74e153ae3f4e5a 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/rand.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rand.c @@ -1,6 +1,7 @@ -/* $Id: rand.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: rand.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/rbtree.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rbtree.c similarity index 95% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/rbtree.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/rbtree.c index 5ae6cb25a84f651fcfa6e5b1bddd1cb8b5c262fa..14ddd3b06501a68de83f66f08b72e3f1302fef24 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/rbtree.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rbtree.c @@ -1,6 +1,7 @@ -/* $Id: rbtree.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: rbtree.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/rtems_network_config.h b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rtems_network_config.h similarity index 95% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/rtems_network_config.h rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/rtems_network_config.h index 5f4f886a124a42dad193648b5c5e7786c045e436..ef08f3d32eab77a631613e8938575a514e096198 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/rtems_network_config.h +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rtems_network_config.h @@ -1,6 +1,7 @@ -/* $Id: rtems_network_config.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: rtems_network_config.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/select.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/select.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/select.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/select.c index 03af7c63a44533e8484f0ed5e92dca17772997af..f9f37b96a083abb5415ff4785c3142a8eba8af2f 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/select.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/select.c @@ -1,6 +1,7 @@ -/* $Id: select.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: select.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/sleep.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sleep.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/sleep.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/sleep.c index 2c93a1aa002690eb8a21b6a7a5fdd8e47d14fefe..46a1e06780abd99980c28560985958aa90a626ee 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/sleep.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sleep.c @@ -1,6 +1,7 @@ -/* $Id: sleep.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sleep.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/sock.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sock.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/sock.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/sock.c index 6cbb5275664a2c80d427eb9c67a4cdf41d58a800..cbfa77cc500e570b629b2ef8c5b3e81ef3d7efca 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/sock.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sock.c @@ -1,6 +1,7 @@ -/* $Id: sock.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sock.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/sock_perf.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sock_perf.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/sock_perf.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/sock_perf.c index 299a52e4ac6e38a18a567cd678b82128c6896d59..51928ddf75f0826ea454d92d11d6b94a5d5c4900 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/sock_perf.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sock_perf.c @@ -1,6 +1,7 @@ -/* $Id: sock_perf.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sock_perf.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/string.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/string.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/string.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/string.c index ce53cf588abd9834c321ffac991f5a0f7923f44c..9ff3836d72381470a5460dcd9f1a16f0a96cad71 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/string.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/string.c @@ -1,6 +1,7 @@ -/* $Id: string.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: string.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/test.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/test.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/test.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/test.c index b078b9b91fb4e1a1fd0c94e45ce293352dacb78a..b6f8b24915c2c1bb9a60115d0b7d4c418f5107bb 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/test.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/test.c @@ -1,6 +1,7 @@ -/* $Id: test.c 2138 2008-07-14 16:58:11Z bennylp $ */ +/* $Id: test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/test.h b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/test.h similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/test.h rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/test.h index ad65a22a398ca4e0b0278564f58097ea1c9d5833..796ba6d07fde0c32f17e6c31117a471e6c6626b1 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/test.h +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/test.h @@ -1,6 +1,7 @@ -/* $Id: test.h 2138 2008-07-14 16:58:11Z bennylp $ */ +/* $Id: test.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/thread.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/thread.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/thread.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/thread.c index 1faa72c66169b0410f91edbabde5b0bddb04bd39..126b1ef5aa4862b12fbd2d72e72becc66da40b60 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/thread.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/thread.c @@ -1,6 +1,7 @@ -/* $Id: thread.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: thread.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/timer.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/timer.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/timer.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/timer.c index fd9b40d4b1cff48c4a28d1b04b675a39be9cfa78..f378091b746343aa0edb891dd22caed6571bcc80 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/timer.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/timer.c @@ -1,6 +1,7 @@ -/* $Id: timer.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: timer.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/timestamp.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/timestamp.c similarity index 97% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/timestamp.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/timestamp.c index 3b54135ba6d9594cbbcf7a673000844ff7855c59..3f04448f7993fa6030d29a3f55b9ee320676d8c6 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/timestamp.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/timestamp.c @@ -1,6 +1,7 @@ -/* $Id: timestamp.c 2336 2008-10-01 09:02:12Z bennylp $ */ +/* $Id: timestamp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c similarity index 98% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c index eab440ce7a969997d9f3e18fcaaa1b269d3489e4..f23350e3a24cb525215b98e6dcf25d77dc6887e9 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c @@ -1,6 +1,7 @@ /* $Id$ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/udp_echo_srv_sync.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_sync.c similarity index 96% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/udp_echo_srv_sync.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_sync.c index 4eadba3246e7d1f6c8cf0ba3285425778fedd272..5930c9faa1d38e8f6e42c65304afc83ed0ee2668 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/udp_echo_srv_sync.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_sync.c @@ -1,6 +1,7 @@ -/* $Id: udp_echo_srv_sync.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: udp_echo_srv_sync.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjlib/src/pjlib-test/util.c b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/util.c similarity index 95% rename from libs/pjproject-1.0/pjlib/src/pjlib-test/util.c rename to libs/pjproject-1.0.1/pjlib/src/pjlib-test/util.c index d26f22ec85a9a87d8f3f0e94363d08d0b51eae89..97f51b206990e0b4404aaaa04c9ab43d7a42aa48 100644 --- a/libs/pjproject-1.0/pjlib/src/pjlib-test/util.c +++ b/libs/pjproject-1.0.1/pjlib/src/pjlib-test/util.c @@ -1,6 +1,7 @@ -/* $Id: util.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: util.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/README.txt b/libs/pjproject-1.0.1/pjmedia/README.txt similarity index 100% rename from libs/pjproject-1.0/pjmedia/README.txt rename to libs/pjproject-1.0.1/pjmedia/README.txt diff --git a/libs/pjproject-1.0/pjmedia/build/Jbtest.dat b/libs/pjproject-1.0.1/pjmedia/build/Jbtest.dat similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/Jbtest.dat rename to libs/pjproject-1.0.1/pjmedia/build/Jbtest.dat diff --git a/libs/pjproject-1.0/pjmedia/build/m-i386.mak b/libs/pjproject-1.0.1/pjmedia/build/m-i386.mak similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/m-i386.mak rename to libs/pjproject-1.0.1/pjmedia/build/m-i386.mak diff --git a/libs/pjproject-1.0/pjmedia/build/m-x86_64.mak b/libs/pjproject-1.0.1/pjmedia/build/m-x86_64.mak similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/m-x86_64.mak rename to libs/pjproject-1.0.1/pjmedia/build/m-x86_64.mak diff --git a/libs/pjproject-1.0.1/pjmedia/build/os-auto.mak b/libs/pjproject-1.0.1/pjmedia/build/os-auto.mak new file mode 100644 index 0000000000000000000000000000000000000000..88526c7557229514b8c39702af29d1293afeb01f --- /dev/null +++ b/libs/pjproject-1.0.1/pjmedia/build/os-auto.mak @@ -0,0 +1,109 @@ +# pjmedia/build/os-auto.mak. Generated from os-auto.mak.in by configure. + +# PJMEDIA features exclusion +export CFLAGS += + +# Define the desired sound device backend +# Valid values are: +# - pa_unix: PortAudio on Unix (OSS or ALSA) +# - pa_darwinos: PortAudio on MacOSX (CoreAudio) +# - pa_old_darwinos: PortAudio on MacOSX (old CoreAudio, for OSX 10.2) +# - pa_win32: PortAudio on Win32 (WMME) +# - ds: Win32 DirectSound (dsound.c) +# - null: Null sound device (nullsound.c) +# - external: Link with no sounddev (app will provide) +AC_PJMEDIA_SND=pa_unix + +# For Unix, specify if ALSA should be supported +AC_PA_USE_ALSA=1 + +# Additional PortAudio CFLAGS are in -DHAVE_SYS_SOUNDCARD_H -DHAVE_LINUX_SOUNDCARD_H -DPA_LITTLE_ENDIAN + +# +# Codecs +# +AC_NO_G711_CODEC= +AC_NO_L16_CODEC= +AC_NO_GSM_CODEC= +AC_NO_SPEEX_CODEC= +AC_NO_ILBC_CODEC= +AC_NO_G722_CODEC= + +export CODEC_OBJS= + +ifeq ($(AC_NO_G711_CODEC),1) +export CFLAGS += -DPJMEDIA_HAS_G711_CODEC=0 +else +export CODEC_OBJS += +endif + +ifeq ($(AC_NO_L16_CODEC),1) +export CFLAGS += -DPJMEDIA_HAS_L16_CODEC=0 +else +export CODEC_OBJS += l16.o +endif + +ifeq ($(AC_NO_GSM_CODEC),1) +export CFLAGS += -DPJMEDIA_HAS_GSM_CODEC=0 +else +export CODEC_OBJS += gsm.o +endif + +ifeq ($(AC_NO_SPEEX_CODEC),1) +export CFLAGS += -DPJMEDIA_HAS_SPEEX_CODEC=0 +else +export CFLAGS += -I$(THIRD_PARTY)/build/speex -I$(THIRD_PARTY)/speex/include +export CODEC_OBJS += speex_codec.o + +ifneq (,1) +export PJMEDIA_OBJS += echo_speex.o +endif + +endif + +ifeq ($(AC_NO_ILBC_CODEC),1) +export CFLAGS += -DPJMEDIA_HAS_ILBC_CODEC=0 +else +export CODEC_OBJS += ilbc.o +endif + +ifeq ($(AC_NO_G722_CODEC),1) +export CFLAGS += -DPJMEDIA_HAS_G722_CODEC=0 +else +export CODEC_OBJS += g722.o g722/g722_enc.o g722/g722_dec.o +endif + + +# +# PortAudio +# +ifneq ($(findstring pa,$(AC_PJMEDIA_SND)),) +export CFLAGS += -I$(THIRD_PARTY)/build/portaudio -I$(THIRD_PARTY)/portaudio/include -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_PORTAUDIO_SOUND +export SOUND_OBJS = pasound.o +endif + +# +# Win32 DirectSound +# +ifeq ($(AC_PJMEDIA_SND),ds) +export SOUND_OBJS = dsound.o +export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_WIN32_DIRECT_SOUND +endif + +# +# Null sound device +# +ifeq ($(AC_PJMEDIA_SND),null) +export SOUND_OBJS = nullsound.o +export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_NULL_SOUND +endif + +# +# External sound device +# +ifeq ($(AC_PJMEDIA_SND),external) +export SOUND_OBJS = +export CFLAGS += -DPJMEDIA_SOUND_IMPLEMENTATION=PJMEDIA_SOUND_EXTERNAL +endif + + diff --git a/libs/pjproject-1.0/pjmedia/build/os-auto.mak.in b/libs/pjproject-1.0.1/pjmedia/build/os-auto.mak.in similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/os-auto.mak.in rename to libs/pjproject-1.0.1/pjmedia/build/os-auto.mak.in diff --git a/libs/pjproject-1.0/pjmedia/build/os-darwinos.mak b/libs/pjproject-1.0.1/pjmedia/build/os-darwinos.mak similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/os-darwinos.mak rename to libs/pjproject-1.0.1/pjmedia/build/os-darwinos.mak diff --git a/libs/pjproject-1.0/pjmedia/build/os-linux.mak b/libs/pjproject-1.0.1/pjmedia/build/os-linux.mak similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/os-linux.mak rename to libs/pjproject-1.0.1/pjmedia/build/os-linux.mak diff --git a/libs/pjproject-1.0/pjmedia/build/os-rtems.mak b/libs/pjproject-1.0.1/pjmedia/build/os-rtems.mak similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/os-rtems.mak rename to libs/pjproject-1.0.1/pjmedia/build/os-rtems.mak diff --git a/libs/pjproject-1.0/pjmedia/build/os-win32.mak b/libs/pjproject-1.0.1/pjmedia/build/os-win32.mak similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/os-win32.mak rename to libs/pjproject-1.0.1/pjmedia/build/os-win32.mak diff --git a/libs/pjproject-1.0/pjmedia/build/pjaut.dsp b/libs/pjproject-1.0.1/pjmedia/build/pjaut.dsp similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/pjaut.dsp rename to libs/pjproject-1.0.1/pjmedia/build/pjaut.dsp diff --git a/libs/pjproject-1.0/pjmedia/build/pjmedia.dsp b/libs/pjproject-1.0.1/pjmedia/build/pjmedia.dsp similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/pjmedia.dsp rename to libs/pjproject-1.0.1/pjmedia/build/pjmedia.dsp diff --git a/libs/pjproject-1.0/pjmedia/build/pjmedia.dsw b/libs/pjproject-1.0.1/pjmedia/build/pjmedia.dsw similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/pjmedia.dsw rename to libs/pjproject-1.0.1/pjmedia/build/pjmedia.dsw diff --git a/libs/pjproject-1.0/pjmedia/build/pjmedia.vcproj b/libs/pjproject-1.0.1/pjmedia/build/pjmedia.vcproj similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/pjmedia.vcproj rename to libs/pjproject-1.0.1/pjmedia/build/pjmedia.vcproj diff --git a/libs/pjproject-1.0/pjmedia/build/pjmedia_codec.dsp b/libs/pjproject-1.0.1/pjmedia/build/pjmedia_codec.dsp similarity index 94% rename from libs/pjproject-1.0/pjmedia/build/pjmedia_codec.dsp rename to libs/pjproject-1.0.1/pjmedia/build/pjmedia_codec.dsp index 373d5355c5f2aa1a43e46c85519de08ba845279b..8df43c268ccf600eaefec9ea1682138eb891db23 100644 --- a/libs/pjproject-1.0/pjmedia/build/pjmedia_codec.dsp +++ b/libs/pjproject-1.0.1/pjmedia/build/pjmedia_codec.dsp @@ -164,6 +164,10 @@ SOURCE="..\src\pjmedia-codec\speex_codec.c" # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File +SOURCE="..\include\pjmedia-codec\amr_helper.h" +# End Source File +# Begin Source File + SOURCE="..\include\pjmedia-codec\config.h" # End Source File # Begin Source File diff --git a/libs/pjproject-1.0/pjmedia/build/pjmedia_codec.vcproj b/libs/pjproject-1.0.1/pjmedia/build/pjmedia_codec.vcproj similarity index 94% rename from libs/pjproject-1.0/pjmedia/build/pjmedia_codec.vcproj rename to libs/pjproject-1.0.1/pjmedia/build/pjmedia_codec.vcproj index f22bf73f74187ece7f58ba70692dc05ac1c40e95..7ed2c3dab7b726c575e5634909f597e2e7aa1159 100644 --- a/libs/pjproject-1.0/pjmedia/build/pjmedia_codec.vcproj +++ b/libs/pjproject-1.0.1/pjmedia/build/pjmedia_codec.vcproj @@ -296,6 +296,10 @@ Name="Header Files" Filter="h;hpp;hxx;hm;inl" > + + diff --git a/libs/pjproject-1.0/pjmedia/build/pjmedia_test.dsp b/libs/pjproject-1.0.1/pjmedia/build/pjmedia_test.dsp similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/pjmedia_test.dsp rename to libs/pjproject-1.0.1/pjmedia/build/pjmedia_test.dsp diff --git a/libs/pjproject-1.0/pjmedia/build/pjmedia_test.vcproj b/libs/pjproject-1.0.1/pjmedia/build/pjmedia_test.vcproj similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/pjmedia_test.vcproj rename to libs/pjproject-1.0.1/pjmedia/build/pjmedia_test.vcproj diff --git a/libs/pjproject-1.0/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp b/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp rename to libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp diff --git a/libs/pjproject-1.0/pjmedia/build/wince-evc4/pjmedia_test.vcp b/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_test.vcp similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/wince-evc4/pjmedia_test.vcp rename to libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_test.vcp diff --git a/libs/pjproject-1.0/pjmedia/build/wince-evc4/pjmedia_wince.vcp b/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/wince-evc4/pjmedia_wince.vcp rename to libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_wince.vcp diff --git a/libs/pjproject-1.0/pjmedia/build/wince-evc4/pjmedia_wince.vcw b/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_wince.vcw similarity index 100% rename from libs/pjproject-1.0/pjmedia/build/wince-evc4/pjmedia_wince.vcw rename to libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_wince.vcw diff --git a/libs/pjproject-1.0/pjmedia/docs/doxygen.cfg b/libs/pjproject-1.0.1/pjmedia/docs/doxygen.cfg similarity index 100% rename from libs/pjproject-1.0/pjmedia/docs/doxygen.cfg rename to libs/pjproject-1.0.1/pjmedia/docs/doxygen.cfg diff --git a/libs/pjproject-1.0/pjmedia/docs/footer.html b/libs/pjproject-1.0.1/pjmedia/docs/footer.html similarity index 80% rename from libs/pjproject-1.0/pjmedia/docs/footer.html rename to libs/pjproject-1.0.1/pjmedia/docs/footer.html index 757333e766021a63c8250ddf248eb187750cc0f4..ec5a45f571c8797ba7010f6f30acb87c0658014c 100644 --- a/libs/pjproject-1.0/pjmedia/docs/footer.html +++ b/libs/pjproject-1.0.1/pjmedia/docs/footer.html @@ -1,7 +1,7 @@

 

PJMEDIA small footprint Open Source media stack
-(C)2003-2008 Benny Prijono +Copyright (C) 2006-2008 Teluu Inc.
diff --git a/libs/pjproject-1.0/pjmedia/docs/header.html b/libs/pjproject-1.0.1/pjmedia/docs/header.html similarity index 100% rename from libs/pjproject-1.0/pjmedia/docs/header.html rename to libs/pjproject-1.0.1/pjmedia/docs/header.html diff --git a/libs/pjproject-1.0/pjmedia/docs/master-port.jpg b/libs/pjproject-1.0.1/pjmedia/docs/master-port.jpg similarity index 100% rename from libs/pjproject-1.0/pjmedia/docs/master-port.jpg rename to libs/pjproject-1.0.1/pjmedia/docs/master-port.jpg diff --git a/libs/pjproject-1.0/pjmedia/docs/media-flow.jpg b/libs/pjproject-1.0.1/pjmedia/docs/media-flow.jpg similarity index 100% rename from libs/pjproject-1.0/pjmedia/docs/media-flow.jpg rename to libs/pjproject-1.0.1/pjmedia/docs/media-flow.jpg diff --git a/libs/pjproject-1.0/pjmedia/docs/media-flow.vsd b/libs/pjproject-1.0.1/pjmedia/docs/media-flow.vsd similarity index 100% rename from libs/pjproject-1.0/pjmedia/docs/media-flow.vsd rename to libs/pjproject-1.0.1/pjmedia/docs/media-flow.vsd diff --git a/libs/pjproject-1.0/pjmedia/docs/media-srtp-transport.PNG b/libs/pjproject-1.0.1/pjmedia/docs/media-srtp-transport.PNG similarity index 100% rename from libs/pjproject-1.0/pjmedia/docs/media-srtp-transport.PNG rename to libs/pjproject-1.0.1/pjmedia/docs/media-srtp-transport.PNG diff --git a/libs/pjproject-1.0/pjmedia/docs/media-transport.PNG b/libs/pjproject-1.0.1/pjmedia/docs/media-transport.PNG similarity index 100% rename from libs/pjproject-1.0/pjmedia/docs/media-transport.PNG rename to libs/pjproject-1.0.1/pjmedia/docs/media-transport.PNG diff --git a/libs/pjproject-1.0/pjmedia/docs/sample-manual-resampling.jpg b/libs/pjproject-1.0.1/pjmedia/docs/sample-manual-resampling.jpg similarity index 100% rename from libs/pjproject-1.0/pjmedia/docs/sample-manual-resampling.jpg rename to libs/pjproject-1.0.1/pjmedia/docs/sample-manual-resampling.jpg diff --git a/libs/pjproject-1.0/pjmedia/docs/siprtp.jpg b/libs/pjproject-1.0.1/pjmedia/docs/siprtp.jpg similarity index 100% rename from libs/pjproject-1.0/pjmedia/docs/siprtp.jpg rename to libs/pjproject-1.0.1/pjmedia/docs/siprtp.jpg diff --git a/libs/pjproject-1.0/pjmedia/docs/sndtest.jpg b/libs/pjproject-1.0.1/pjmedia/docs/sndtest.jpg similarity index 100% rename from libs/pjproject-1.0/pjmedia/docs/sndtest.jpg rename to libs/pjproject-1.0.1/pjmedia/docs/sndtest.jpg diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec.h similarity index 86% rename from libs/pjproject-1.0/pjmedia/include/pjmedia-codec.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec.h index f8a7e8bccedbdd2a3ee6aca052ffa0f33e4b0694..5d354444969376e11374e032164c0f97c5b30e6e 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec.h @@ -1,6 +1,7 @@ -/* $Id: pjmedia-codec.h 2216 2008-08-15 13:17:39Z nanang $ */ +/* $Id: pjmedia-codec.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/amr_helper.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/amr_helper.h new file mode 100644 index 0000000000000000000000000000000000000000..71b88616d54164e7fbe026e113d356b85f785766 --- /dev/null +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/amr_helper.h @@ -0,0 +1,1195 @@ +/* $Id: amr_helper.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef __PJMEDIA_CODECS_AMR_HELPER_H__ +#define __PJMEDIA_CODECS_AMR_HELPER_H__ + +/** + * @file pjmedia-codec/amr_helper.h + * @brief Common tables and helper functions for AMR codec (NB & WB). + */ + + +#ifdef _MSC_VER +# pragma warning(disable:4214) // bit field types other than int +#endif + +/** + * @defgroup PJMED_AMR_CODEC_HELPER AMR Codec Helper + * @ingroup PJMEDIA_CODEC + * @brief AMR common tables and helper functions. + * @{ + * + * This sections describes common AMR constants tables (e.g: bits sensitivity + * order map, frame lengths, bitrates) and helper functions (e.g: pack AMR + * payload in octet-aligned mode or bandwidth-efficient mode, payload parser, + * reorder AMR bitstream). + */ + +PJ_BEGIN_DECL + + +/* AMR bits sensitivity order maps */ + +const pj_int16_t pjmedia_codec_amrnb_ordermap122[244] = +{ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 23, 15, 16, 17, 18, + 19, 20, 21, 22, 24, 25, 26, 27, 28, 38, + 141, 39, 142, 40, 143, 41, 144, 42, 145, 43, + 146, 44, 147, 45, 148, 46, 149, 47, 97, 150, + 200, 48, 98, 151, 201, 49, 99, 152, 202, 86, + 136, 189, 239, 87, 137, 190, 240, 88, 138, 191, + 241, 91, 194, 92, 195, 93, 196, 94, 197, 95, + 198, 29, 30, 31, 32, 33, 34, 35, 50, 100, + 153, 203, 89, 139, 192, 242, 51, 101, 154, 204, + 55, 105, 158, 208, 90, 140, 193, 243, 59, 109, + 162, 212, 63, 113, 166, 216, 67, 117, 170, 220, + 36, 37, 54, 53, 52, 58, 57, 56, 62, 61, + 60, 66, 65, 64, 70, 69, 68, 104, 103, 102, + 108, 107, 106, 112, 111, 110, 116, 115, 114, 120, + 119, 118, 157, 156, 155, 161, 160, 159, 165, 164, + 163, 169, 168, 167, 173, 172, 171, 207, 206, 205, + 211, 210, 209, 215, 214, 213, 219, 218, 217, 223, + 222, 221, 73, 72, 71, 76, 75, 74, 79, 78, + 77, 82, 81, 80, 85, 84, 83, 123, 122, 121, + 126, 125, 124, 129, 128, 127, 132, 131, 130, 135, + 134, 133, 176, 175, 174, 179, 178, 177, 182, 181, + 180, 185, 184, 183, 188, 187, 186, 226, 225, 224, + 229, 228, 227, 232, 231, 230, 235, 234, 233, 238, + 237, 236, 96, 199 +}; + +const pj_int16_t pjmedia_codec_amrnb_ordermap102[204] = +{ + 7, 6, 5, 4, 3, 2, 1, 0, 16, 15, + 14, 13, 12, 11, 10, 9, 8, 26, 27, 28, + 29, 30, 31, 115, 116, 117, 118, 119, 120, 72, + 73, 161, 162, 65, 68, 69, 108, 111, 112, 154, + 157, 158, 197, 200, 201, 32, 33, 121, 122, 74, + 75, 163, 164, 66, 109, 155, 198, 19, 23, 21, + 22, 18, 17, 20, 24, 25, 37, 36, 35, 34, + 80, 79, 78, 77, 126, 125, 124, 123, 169, 168, + 167, 166, 70, 67, 71, 113, 110, 114, 159, 156, + 160, 202, 199, 203, 76, 165, 81, 82, 92, 91, + 93, 83, 95, 85, 84, 94, 101, 102, 96, 104, + 86, 103, 87, 97, 127, 128, 138, 137, 139, 129, + 141, 131, 130, 140, 147, 148, 142, 150, 132, 149, + 133, 143, 170, 171, 181, 180, 182, 172, 184, 174, + 173, 183, 190, 191, 185, 193, 175, 192, 176, 186, + 38, 39, 49, 48, 50, 40, 52, 42, 41, 51, + 58, 59, 53, 61, 43, 60, 44, 54, 194, 179, + 189, 196, 177, 195, 178, 187, 188, 151, 136, 146, + 153, 134, 152, 135, 144, 145, 105, 90, 100, 107, + 88, 106, 89, 98, 99, 62, 47, 57, 64, 45, + 63, 46, 55, 56 +}; + +const pj_int16_t pjmedia_codec_amrnb_ordermap795[159] = +{ + 8, 7, 6, 5, 4, 3, 2, 14, 16, 9, + 10, 12, 13, 15, 11, 17, 20, 22, 24, 23, + 19, 18, 21, 56, 88, 122, 154, 57, 89, 123, + 155, 58, 90, 124, 156, 52, 84, 118, 150, 53, + 85, 119, 151, 27, 93, 28, 94, 29, 95, 30, + 96, 31, 97, 61, 127, 62, 128, 63, 129, 59, + 91, 125, 157, 32, 98, 64, 130, 1, 0, 25, + 26, 33, 99, 34, 100, 65, 131, 66, 132, 54, + 86, 120, 152, 60, 92, 126, 158, 55, 87, 121, + 153, 117, 116, 115, 46, 78, 112, 144, 43, 75, + 109, 141, 40, 72, 106, 138, 36, 68, 102, 134, + 114, 149, 148, 147, 146, 83, 82, 81, 80, 51, + 50, 49, 48, 47, 45, 44, 42, 39, 35, 79, + 77, 76, 74, 71, 67, 113, 111, 110, 108, 105, + 101, 145, 143, 142, 140, 137, 133, 41, 73, 107, + 139, 37, 69, 103, 135, 38, 70, 104, 136 +}; + +const pj_int16_t pjmedia_codec_amrnb_ordermap74[148] = +{ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 16, 26, 87, 27, + 88, 28, 89, 29, 90, 30, 91, 51, 80, 112, + 141, 52, 81, 113, 142, 54, 83, 115, 144, 55, + 84, 116, 145, 58, 119, 59, 120, 21, 22, 23, + 17, 18, 19, 31, 60, 92, 121, 56, 85, 117, + 146, 20, 24, 25, 50, 79, 111, 140, 57, 86, + 118, 147, 49, 78, 110, 139, 48, 77, 53, 82, + 114, 143, 109, 138, 47, 76, 108, 137, 32, 33, + 61, 62, 93, 94, 122, 123, 41, 42, 43, 44, + 45, 46, 70, 71, 72, 73, 74, 75, 102, 103, + 104, 105, 106, 107, 131, 132, 133, 134, 135, 136, + 34, 63, 95, 124, 35, 64, 96, 125, 36, 65, + 97, 126, 37, 66, 98, 127, 38, 67, 99, 128, + 39, 68, 100, 129, 40, 69, 101, 130 +}; + +const pj_int16_t pjmedia_codec_amrnb_ordermap67[134] = +{ + 0, 1, 4, 3, 5, 6, 13, 7, 2, 8, + 9, 11, 15, 12, 14, 10, 28, 82, 29, 83, + 27, 81, 26, 80, 30, 84, 16, 55, 109, 56, + 110, 31, 85, 57, 111, 48, 73, 102, 127, 32, + 86, 51, 76, 105, 130, 52, 77, 106, 131, 58, + 112, 33, 87, 19, 23, 53, 78, 107, 132, 21, + 22, 18, 17, 20, 24, 25, 50, 75, 104, 129, + 47, 72, 101, 126, 54, 79, 108, 133, 46, 71, + 100, 125, 128, 103, 74, 49, 45, 70, 99, 124, + 42, 67, 96, 121, 39, 64, 93, 118, 38, 63, + 92, 117, 35, 60, 89, 114, 34, 59, 88, 113, + 44, 69, 98, 123, 43, 68, 97, 122, 41, 66, + 95, 120, 40, 65, 94, 119, 37, 62, 91, 116, + 36, 61, 90, 115 +}; + +const pj_int16_t pjmedia_codec_amrnb_ordermap59[118] = +{ + 0, 1, 4, 5, 3, 6, 7, 2, 13, 15, + 8, 9, 11, 12, 14, 10, 16, 28, 74, 29, + 75, 27, 73, 26, 72, 30, 76, 51, 97, 50, + 71, 96, 117, 31, 77, 52, 98, 49, 70, 95, + 116, 53, 99, 32, 78, 33, 79, 48, 69, 94, + 115, 47, 68, 93, 114, 46, 67, 92, 113, 19, + 21, 23, 22, 18, 17, 20, 24, 111, 43, 89, + 110, 64, 65, 44, 90, 25, 45, 66, 91, 112, + 54, 100, 40, 61, 86, 107, 39, 60, 85, 106, + 36, 57, 82, 103, 35, 56, 81, 102, 34, 55, + 80, 101, 42, 63, 88, 109, 41, 62, 87, 108, + 38, 59, 84, 105, 37, 58, 83, 104 +}; + +const pj_int16_t pjmedia_codec_amrnb_ordermap515[103] = +{ + 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, + 13, 12, 11, 10, 9, 8, 23, 24, 25, 26, + 27, 46, 65, 84, 45, 44, 43, 64, 63, 62, + 83, 82, 81, 102, 101, 100, 42, 61, 80, 99, + 28, 47, 66, 85, 18, 41, 60, 79, 98, 29, + 48, 67, 17, 20, 22, 40, 59, 78, 97, 21, + 30, 49, 68, 86, 19, 16, 87, 39, 38, 58, + 57, 77, 35, 54, 73, 92, 76, 96, 95, 36, + 55, 74, 93, 32, 51, 33, 52, 70, 71, 89, + 90, 31, 50, 69, 88, 37, 56, 75, 94, 34, + 53, 72, 91 +}; + +const pj_int16_t pjmedia_codec_amrnb_ordermap475[95] = +{ + 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, + 10, 11, 12, 13, 14, 15, 23, 24, 25, 26, + 27, 28, 48, 49, 61, 62, 82, 83, 47, 46, + 45, 44, 81, 80, 79, 78, 17, 18, 20, 22, + 77, 76, 75, 74, 29, 30, 43, 42, 41, 40, + 38, 39, 16, 19, 21, 50, 51, 59, 60, 63, + 64, 72, 73, 84, 85, 93, 94, 32, 33, 35, + 36, 53, 54, 56, 57, 66, 67, 69, 70, 87, + 88, 90, 91, 34, 55, 68, 89, 37, 58, 71, + 92, 31, 52, 65, 86 +}; + + +const pj_int16_t pjmedia_codec_amrwb_ordermap_660[] = +{ + 0, 5, 6, 7, 61, 84, 107, 130, 62, 85, + 8, 4, 37, 38, 39, 40, 58, 81, 104, 127, + 60, 83, 106, 129, 108, 131, 128, 41, 42, 80, + 126, 1, 3, 57, 103, 82, 105, 59, 2, 63, + 109, 110, 86, 19, 22, 23, 64, 87, 18, 20, + 21, 17, 13, 88, 43, 89, 65, 111, 14, 24, + 25, 26, 27, 28, 15, 16, 44, 90, 66, 112, + 9, 11, 10, 12, 67, 113, 29, 30, 31, 32, + 34, 33, 35, 36, 45, 51, 68, 74, 91, 97, + 114, 120, 46, 69, 92, 115, 52, 75, 98, 121, + 47, 70, 93, 116, 53, 76, 99, 122, 48, 71, + 94, 117, 54, 77, 100, 123, 49, 72, 95, 118, + 55, 78, 101, 124, 50, 73, 96, 119, 56, 79, + 102, 125 +}; + +const pj_int16_t pjmedia_codec_amrwb_ordermap_885[] = +{ + 0, 4, 6, 7, 5, 3, 47, 48, 49, 112, + 113, 114, 75, 106, 140, 171, 80, 111, 145, 176, + 77, 108, 142, 173, 78, 109, 143, 174, 79, 110, + 144, 175, 76, 107, 141, 172, 50, 115, 51, 2, + 1, 81, 116, 146, 19, 21, 12, 17, 18, 20, + 16, 25, 13, 10, 14, 24, 23, 22, 26, 8, + 15, 52, 117, 31, 82, 147, 9, 33, 11, 83, + 148, 53, 118, 28, 27, 84, 149, 34, 35, 29, + 46, 32, 30, 54, 119, 37, 36, 39, 38, 40, + 85, 150, 41, 42, 43, 44, 45, 55, 60, 65, + 70, 86, 91, 96, 101, 120, 125, 130, 135, 151, + 156, 161, 166, 56, 87, 121, 152, 61, 92, 126, + 157, 66, 97, 131, 162, 71, 102, 136, 167, 57, + 88, 122, 153, 62, 93, 127, 158, 67, 98, 132, + 163, 72, 103, 137, 168, 58, 89, 123, 154, 63, + 94, 128, 159, 68, 99, 133, 164, 73, 104, 138, + 169, 59, 90, 124, 155, 64, 95, 129, 160, 69, + 100, 134, 165, 74, 105, 139, 170 +}; + +const pj_int16_t pjmedia_codec_amrwb_ordermap_1265[] = +{ + 0, 4, 6, 93, 143, 196, 246, 7, 5, 3, + 47, 48, 49, 50, 51, 150, 151, 152, 153, 154, + 94, 144, 197, 247, 99, 149, 202, 252, 96, 146, + 199, 249, 97, 147, 200, 250, 100, 203, 98, 148, + 201, 251, 95, 145, 198, 248, 52, 2, 1, 101, + 204, 155, 19, 21, 12, 17, 18, 20, 16, 25, + 13, 10, 14, 24, 23, 22, 26, 8, 15, 53, + 156, 31, 102, 205, 9, 33, 11, 103, 206, 54, + 157, 28, 27, 104, 207, 34, 35, 29, 46, 32, + 30, 55, 158, 37, 36, 39, 38, 40, 105, 208, + 41, 42, 43, 44, 45, 56, 106, 159, 209, 57, + 66, 75, 84, 107, 116, 125, 134, 160, 169, 178, + 187, 210, 219, 228, 237, 58, 108, 161, 211, 62, + 112, 165, 215, 67, 117, 170, 220, 71, 121, 174, + 224, 76, 126, 179, 229, 80, 130, 183, 233, 85, + 135, 188, 238, 89, 139, 192, 242, 59, 109, 162, + 212, 63, 113, 166, 216, 68, 118, 171, 221, 72, + 122, 175, 225, 77, 127, 180, 230, 81, 131, 184, + 234, 86, 136, 189, 239, 90, 140, 193, 243, 60, + 110, 163, 213, 64, 114, 167, 217, 69, 119, 172, + 222, 73, 123, 176, 226, 78, 128, 181, 231, 82, + 132, 185, 235, 87, 137, 190, 240, 91, 141, 194, + 244, 61, 111, 164, 214, 65, 115, 168, 218, 70, + 120, 173, 223, 74, 124, 177, 227, 79, 129, 182, + 232, 83, 133, 186, 236, 88, 138, 191, 241, 92, + 142, 195, 245 +}; + +const pj_int16_t pjmedia_codec_amrwb_ordermap_1425[] = +{ + 0, 4, 6, 101, 159, 220, 278, 7, 5, 3, + 47, 48, 49, 50, 51, 166, 167, 168, 169, 170, + 102, 160, 221, 279, 107, 165, 226, 284, 104, 162, + 223, 281, 105, 163, 224, 282, 108, 227, 106, 164, + 225, 283, 103, 161, 222, 280, 52, 2, 1, 109, + 228, 171, 19, 21, 12, 17, 18, 20, 16, 25, + 13, 10, 14, 24, 23, 22, 26, 8, 15, 53, + 172, 31, 110, 229, 9, 33, 11, 111, 230, 54, + 173, 28, 27, 112, 231, 34, 35, 29, 46, 32, + 30, 55, 174, 37, 36, 39, 38, 40, 113, 232, + 41, 42, 43, 44, 45, 56, 114, 175, 233, 62, + 120, 181, 239, 75, 133, 194, 252, 57, 115, 176, + 234, 63, 121, 182, 240, 70, 128, 189, 247, 76, + 134, 195, 253, 83, 141, 202, 260, 92, 150, 211, + 269, 84, 142, 203, 261, 93, 151, 212, 270, 85, + 143, 204, 262, 94, 152, 213, 271, 86, 144, 205, + 263, 95, 153, 214, 272, 64, 122, 183, 241, 77, + 135, 196, 254, 65, 123, 184, 242, 78, 136, 197, + 255, 87, 145, 206, 264, 96, 154, 215, 273, 58, + 116, 177, 235, 66, 124, 185, 243, 71, 129, 190, + 248, 79, 137, 198, 256, 88, 146, 207, 265, 97, + 155, 216, 274, 59, 117, 178, 236, 67, 125, 186, + 244, 72, 130, 191, 249, 80, 138, 199, 257, 89, + 147, 208, 266, 98, 156, 217, 275, 60, 118, 179, + 237, 68, 126, 187, 245, 73, 131, 192, 250, 81, + 139, 200, 258, 90, 148, 209, 267, 99, 157, 218, + 276, 61, 119, 180, 238, 69, 127, 188, 246, 74, + 132, 193, 251, 82, 140, 201, 259, 91, 149, 210, + 268, 100, 158, 219, 277 +}; + +const pj_int16_t pjmedia_codec_amrwb_ordermap_1585[] = +{ + 0, 4, 6, 109, 175, 244, 310, 7, 5, 3, + 47, 48, 49, 50, 51, 182, 183, 184, 185, 186, + 110, 176, 245, 311, 115, 181, 250, 316, 112, 178, + 247, 313, 113, 179, 248, 314, 116, 251, 114, 180, + 249, 315, 111, 177, 246, 312, 52, 2, 1, 117, + 252, 187, 19, 21, 12, 17, 18, 20, 16, 25, + 13, 10, 14, 24, 23, 22, 26, 8, 15, 53, + 188, 31, 118, 253, 9, 33, 11, 119, 254, 54, + 189, 28, 27, 120, 255, 34, 35, 29, 46, 32, + 30, 55, 190, 37, 36, 39, 38, 40, 121, 256, + 41, 42, 43, 44, 45, 56, 122, 191, 257, 63, + 129, 198, 264, 76, 142, 211, 277, 89, 155, 224, + 290, 102, 168, 237, 303, 57, 123, 192, 258, 70, + 136, 205, 271, 83, 149, 218, 284, 96, 162, 231, + 297, 62, 128, 197, 263, 75, 141, 210, 276, 88, + 154, 223, 289, 101, 167, 236, 302, 58, 124, 193, + 259, 71, 137, 206, 272, 84, 150, 219, 285, 97, + 163, 232, 298, 59, 125, 194, 260, 64, 130, 199, + 265, 67, 133, 202, 268, 72, 138, 207, 273, 77, + 143, 212, 278, 80, 146, 215, 281, 85, 151, 220, + 286, 90, 156, 225, 291, 93, 159, 228, 294, 98, + 164, 233, 299, 103, 169, 238, 304, 106, 172, 241, + 307, 60, 126, 195, 261, 65, 131, 200, 266, 68, + 134, 203, 269, 73, 139, 208, 274, 78, 144, 213, + 279, 81, 147, 216, 282, 86, 152, 221, 287, 91, + 157, 226, 292, 94, 160, 229, 295, 99, 165, 234, + 300, 104, 170, 239, 305, 107, 173, 242, 308, 61, + 127, 196, 262, 66, 132, 201, 267, 69, 135, 204, + 270, 74, 140, 209, 275, 79, 145, 214, 280, 82, + 148, 217, 283, 87, 153, 222, 288, 92, 158, 227, + 293, 95, 161, 230, 296, 100, 166, 235, 301, 105, + 171, 240, 306, 108, 174, 243, 309 +}; + +const pj_int16_t pjmedia_codec_amrwb_ordermap_1825[] = +{ + 0, 4, 6, 121, 199, 280, 358, 7, 5, 3, + 47, 48, 49, 50, 51, 206, 207, 208, 209, 210, + 122, 200, 281, 359, 127, 205, 286, 364, 124, 202, + 283, 361, 125, 203, 284, 362, 128, 287, 126, 204, + 285, 363, 123, 201, 282, 360, 52, 2, 1, 129, + 288, 211, 19, 21, 12, 17, 18, 20, 16, 25, + 13, 10, 14, 24, 23, 22, 26, 8, 15, 53, + 212, 31, 130, 289, 9, 33, 11, 131, 290, 54, + 213, 28, 27, 132, 291, 34, 35, 29, 46, 32, + 30, 55, 214, 37, 36, 39, 38, 40, 133, 292, + 41, 42, 43, 44, 45, 56, 134, 215, 293, 198, + 299, 136, 120, 138, 60, 279, 58, 62, 357, 139, + 140, 295, 156, 57, 219, 297, 63, 217, 137, 170, + 300, 222, 64, 106, 61, 78, 294, 92, 142, 141, + 135, 221, 296, 301, 343, 59, 298, 184, 329, 315, + 220, 216, 265, 251, 218, 237, 352, 223, 157, 86, + 171, 87, 164, 351, 111, 302, 65, 178, 115, 323, + 72, 192, 101, 179, 93, 73, 193, 151, 337, 309, + 143, 274, 69, 324, 165, 150, 97, 338, 110, 310, + 330, 273, 68, 107, 175, 245, 114, 79, 113, 189, + 246, 259, 174, 71, 185, 96, 344, 100, 322, 83, + 334, 316, 333, 252, 161, 348, 147, 82, 269, 232, + 260, 308, 353, 347, 163, 231, 306, 320, 188, 270, + 146, 177, 266, 350, 256, 85, 149, 116, 191, 160, + 238, 258, 336, 305, 255, 88, 224, 99, 339, 230, + 228, 227, 272, 242, 241, 319, 233, 311, 102, 74, + 180, 275, 66, 194, 152, 325, 172, 247, 244, 261, + 117, 158, 166, 354, 75, 144, 108, 312, 94, 186, + 303, 80, 234, 89, 195, 112, 340, 181, 345, 317, + 326, 276, 239, 167, 118, 313, 70, 355, 327, 253, + 190, 176, 271, 104, 98, 153, 103, 90, 76, 267, + 277, 248, 225, 262, 182, 84, 154, 235, 335, 168, + 331, 196, 341, 249, 162, 307, 148, 349, 263, 321, + 257, 243, 229, 356, 159, 119, 67, 187, 173, 145, + 240, 77, 304, 332, 314, 342, 109, 254, 81, 278, + 105, 91, 346, 318, 183, 250, 197, 328, 95, 155, + 169, 268, 226, 236, 264 +}; + +const pj_int16_t pjmedia_codec_amrwb_ordermap_1985[] = +{ + 0, 4, 6, 129, 215, 304, 390, 7, 5, 3, + 47, 48, 49, 50, 51, 222, 223, 224, 225, 226, + 130, 216, 305, 391, 135, 221, 310, 396, 132, 218, + 307, 393, 133, 219, 308, 394, 136, 311, 134, 220, + 309, 395, 131, 217, 306, 392, 52, 2, 1, 137, + 312, 227, 19, 21, 12, 17, 18, 20, 16, 25, + 13, 10, 14, 24, 23, 22, 26, 8, 15, 53, + 228, 31, 138, 313, 9, 33, 11, 139, 314, 54, + 229, 28, 27, 140, 315, 34, 35, 29, 46, 32, + 30, 55, 230, 37, 36, 39, 38, 40, 141, 316, + 41, 42, 43, 44, 45, 56, 142, 231, 317, 63, + 73, 92, 340, 82, 324, 149, 353, 159, 334, 165, + 338, 178, 163, 254, 77, 168, 257, 153, 343, 57, + 248, 238, 79, 252, 166, 67, 80, 201, 101, 267, + 143, 164, 341, 255, 339, 187, 376, 318, 78, 328, + 362, 115, 232, 242, 253, 290, 276, 62, 58, 158, + 68, 93, 179, 319, 148, 169, 154, 72, 385, 329, + 333, 344, 102, 83, 144, 233, 323, 124, 243, 192, + 354, 237, 64, 247, 202, 209, 150, 116, 335, 268, + 239, 299, 188, 196, 298, 94, 195, 258, 123, 363, + 384, 109, 325, 371, 170, 370, 84, 110, 295, 180, + 74, 210, 191, 106, 291, 205, 367, 381, 377, 206, + 355, 122, 119, 120, 383, 160, 105, 108, 277, 380, + 294, 284, 285, 345, 208, 269, 249, 366, 386, 300, + 297, 259, 125, 369, 197, 97, 194, 286, 211, 281, + 280, 183, 372, 87, 155, 283, 59, 348, 327, 184, + 76, 111, 330, 203, 349, 69, 98, 152, 145, 189, + 66, 320, 337, 173, 358, 251, 198, 174, 263, 262, + 126, 241, 193, 88, 388, 117, 95, 387, 112, 359, + 287, 244, 103, 272, 301, 171, 162, 234, 273, 127, + 373, 181, 292, 85, 378, 302, 121, 107, 364, 346, + 356, 212, 278, 213, 65, 382, 288, 207, 113, 175, + 99, 296, 374, 368, 199, 260, 185, 336, 331, 161, + 270, 264, 250, 240, 75, 350, 151, 60, 89, 321, + 156, 274, 360, 326, 70, 282, 167, 146, 352, 81, + 91, 389, 266, 245, 177, 235, 190, 256, 204, 342, + 128, 118, 303, 104, 379, 182, 114, 375, 200, 96, + 293, 172, 214, 365, 279, 86, 289, 351, 347, 357, + 261, 186, 176, 271, 90, 100, 147, 322, 275, 361, + 71, 332, 61, 265, 157, 246, 236 +}; + +const pj_int16_t pjmedia_codec_amrwb_ordermap_2305[] = +{ + 0, 4, 6, 145, 247, 352, 454, 7, 5, 3, + 47, 48, 49, 50, 51, 254, 255, 256, 257, 258, + 146, 248, 353, 455, 151, 253, 358, 460, 148, 250, + 355, 457, 149, 251, 356, 458, 152, 359, 150, 252, + 357, 459, 147, 249, 354, 456, 52, 2, 1, 153, + 360, 259, 19, 21, 12, 17, 18, 20, 16, 25, + 13, 10, 14, 24, 23, 22, 26, 8, 15, 53, + 260, 31, 154, 361, 9, 33, 11, 155, 362, 54, + 261, 28, 27, 156, 363, 34, 35, 29, 46, 32, + 30, 55, 262, 37, 36, 39, 38, 40, 157, 364, + 41, 42, 43, 44, 45, 56, 158, 263, 365, 181, + 192, 170, 79, 57, 399, 90, 159, 297, 377, 366, + 275, 68, 183, 388, 286, 194, 299, 92, 70, 182, + 401, 172, 59, 91, 58, 400, 368, 161, 81, 160, + 264, 171, 80, 389, 390, 378, 379, 193, 298, 69, + 266, 265, 367, 277, 288, 276, 287, 184, 60, 195, + 82, 93, 71, 369, 402, 173, 162, 444, 300, 391, + 98, 76, 278, 61, 267, 374, 135, 411, 167, 102, + 380, 200, 87, 178, 65, 94, 204, 124, 72, 342, + 189, 305, 381, 396, 433, 301, 226, 407, 289, 237, + 113, 215, 185, 128, 309, 403, 116, 320, 196, 331, + 370, 422, 174, 64, 392, 83, 425, 219, 134, 188, + 432, 112, 427, 139, 279, 163, 436, 208, 447, 218, + 236, 229, 97, 294, 385, 230, 166, 268, 177, 443, + 225, 426, 101, 272, 138, 127, 290, 117, 347, 199, + 414, 95, 140, 240, 410, 395, 209, 129, 283, 346, + 105, 241, 437, 86, 308, 448, 203, 345, 186, 107, + 220, 415, 334, 319, 106, 313, 118, 123, 73, 207, + 421, 214, 384, 373, 438, 62, 371, 341, 75, 449, + 168, 323, 164, 242, 416, 324, 304, 197, 335, 404, + 271, 63, 191, 325, 96, 169, 231, 280, 312, 187, + 406, 84, 201, 100, 67, 382, 175, 336, 202, 330, + 269, 393, 376, 383, 293, 307, 409, 179, 285, 314, + 302, 372, 398, 190, 180, 89, 99, 103, 232, 78, + 88, 77, 136, 387, 165, 198, 394, 125, 176, 428, + 74, 375, 238, 227, 66, 273, 282, 141, 306, 412, + 114, 85, 130, 348, 119, 291, 296, 386, 233, 397, + 303, 405, 284, 445, 423, 221, 210, 205, 450, 108, + 274, 434, 216, 343, 337, 142, 243, 321, 408, 451, + 310, 292, 120, 109, 281, 439, 270, 429, 332, 295, + 418, 211, 315, 222, 326, 131, 430, 244, 327, 349, + 417, 316, 143, 338, 440, 234, 110, 212, 452, 245, + 121, 419, 350, 223, 132, 441, 328, 413, 317, 339, + 126, 104, 137, 446, 344, 239, 435, 115, 333, 206, + 322, 217, 228, 424, 453, 311, 351, 111, 442, 224, + 213, 122, 431, 340, 235, 246, 133, 144, 420, 329, + 318 +}; + +const pj_int16_t pjmedia_codec_amrwb_ordermap_2385[] = +{ + 0, 4, 6, 145, 251, 360, 466, 7, 5, 3, + 47, 48, 49, 50, 51, 262, 263, 264, 265, 266, + 146, 252, 361, 467, 151, 257, 366, 472, 148, 254, + 363, 469, 149, 255, 364, 470, 156, 371, 150, 256, + 365, 471, 147, 253, 362, 468, 52, 2, 1, 157, + 372, 267, 19, 21, 12, 17, 18, 20, 16, 25, + 13, 10, 14, 24, 23, 22, 26, 8, 15, 53, + 268, 31, 152, 153, 154, 155, 258, 259, 260, 261, + 367, 368, 369, 370, 473, 474, 475, 476, 158, 373, + 9, 33, 11, 159, 374, 54, 269, 28, 27, 160, + 375, 34, 35, 29, 46, 32, 30, 55, 270, 37, + 36, 39, 38, 40, 161, 376, 41, 42, 43, 44, + 45, 56, 162, 271, 377, 185, 196, 174, 79, 57, + 411, 90, 163, 305, 389, 378, 283, 68, 187, 400, + 294, 198, 307, 92, 70, 186, 413, 176, 59, 91, + 58, 412, 380, 165, 81, 164, 272, 175, 80, 401, + 402, 390, 391, 197, 306, 69, 274, 273, 379, 285, + 296, 284, 295, 188, 60, 199, 82, 93, 71, 381, + 414, 177, 166, 456, 308, 403, 98, 76, 286, 61, + 275, 386, 135, 423, 171, 102, 392, 204, 87, 182, + 65, 94, 208, 124, 72, 350, 193, 313, 393, 408, + 445, 309, 230, 419, 297, 241, 113, 219, 189, 128, + 317, 415, 116, 328, 200, 339, 382, 434, 178, 64, + 404, 83, 437, 223, 134, 192, 444, 112, 439, 139, + 287, 167, 448, 212, 459, 222, 240, 233, 97, 302, + 397, 234, 170, 276, 181, 455, 229, 438, 101, 280, + 138, 127, 298, 117, 355, 203, 426, 95, 140, 244, + 422, 407, 213, 129, 291, 354, 105, 245, 449, 86, + 316, 460, 207, 353, 190, 107, 224, 427, 342, 327, + 106, 321, 118, 123, 73, 211, 433, 218, 396, 385, + 450, 62, 383, 349, 75, 461, 172, 331, 168, 246, + 428, 332, 312, 201, 343, 416, 279, 63, 195, 333, + 96, 173, 235, 288, 320, 191, 418, 84, 205, 100, + 67, 394, 179, 344, 206, 338, 277, 405, 388, 395, + 301, 315, 421, 183, 293, 322, 310, 384, 410, 194, + 184, 89, 99, 103, 236, 78, 88, 77, 136, 399, + 169, 202, 406, 125, 180, 440, 74, 387, 242, 231, + 66, 281, 290, 141, 314, 424, 114, 85, 130, 356, + 119, 299, 304, 398, 237, 409, 311, 417, 292, 457, + 435, 225, 214, 209, 462, 108, 282, 446, 220, 351, + 345, 142, 247, 329, 420, 463, 318, 300, 120, 109, + 289, 451, 278, 441, 340, 303, 430, 215, 323, 226, + 334, 131, 442, 248, 335, 357, 429, 324, 143, 346, + 452, 238, 110, 216, 464, 249, 121, 431, 358, 227, + 132, 453, 336, 425, 325, 347, 126, 104, 137, 458, + 352, 243, 447, 115, 341, 210, 330, 221, 232, 436, + 465, 319, 359, 111, 454, 228, 217, 122, 443, 348, + 239, 250, 133, 144, 432, 337, 326 +}; + +/** + * AMR-NB bitstream sensitivity order maps. + */ +const pj_int16_t* const pjmedia_codec_amrnb_ordermaps[8] = +{ + pjmedia_codec_amrnb_ordermap475, + pjmedia_codec_amrnb_ordermap515, + pjmedia_codec_amrnb_ordermap59, + pjmedia_codec_amrnb_ordermap67, + pjmedia_codec_amrnb_ordermap74, + pjmedia_codec_amrnb_ordermap795, + pjmedia_codec_amrnb_ordermap102, + pjmedia_codec_amrnb_ordermap122 +}; + +/** + * AMR-WB bitstream sensitivity order maps. + */ +const pj_int16_t* const pjmedia_codec_amrwb_ordermaps[9] = +{ + pjmedia_codec_amrwb_ordermap_660, + pjmedia_codec_amrwb_ordermap_885, + pjmedia_codec_amrwb_ordermap_1265, + pjmedia_codec_amrwb_ordermap_1425, + pjmedia_codec_amrwb_ordermap_1585, + pjmedia_codec_amrwb_ordermap_1825, + pjmedia_codec_amrwb_ordermap_1985, + pjmedia_codec_amrwb_ordermap_2305, + pjmedia_codec_amrwb_ordermap_2385 +}; + +/** + * Constant of AMR-NB frame lengths in bytes. + */ +const pj_uint8_t pjmedia_codec_amrnb_framelen[16] = + {12, 13, 15, 17, 19, 20, 26, 31, 5, 0, 0, 0, 0, 0, 0, 5}; +/** + * Constant of AMR-NB frame lengths in bits. + */ +const pj_uint16_t pjmedia_codec_amrnb_framelenbits[9] = + {95, 103, 118, 134, 148, 159, 204, 244, 39}; +/** + * Constant of AMR-NB bitrates. + */ +const pj_uint16_t pjmedia_codec_amrnb_bitrates[8] = + {4750, 5150, 5900, 6700, 7400, 7950, 10200, 12200}; + +/** + * Constant of AMR-WB frame lengths in bytes. + */ +const pj_uint8_t pjmedia_codec_amrwb_framelen[16] = + {17, 23, 32, 37, 40, 46, 50, 58, 60, 5, 0, 0, 0, 0, 0, 5}; +/** + * Constant of AMR-WB frame lengths in bits. + */ +const pj_uint16_t pjmedia_codec_amrwb_framelenbits[10] = + {132, 177, 253, 285, 317, 365, 397, 461, 477, 40}; +/** + * Constant of AMR-WB bitrates. + */ +const pj_uint16_t pjmedia_codec_amrwb_bitrates[9] = + {6600, 8850, 12650, 14250, 15850, 18250, 19850, 23050, 23850}; + + +/** + * This structure describes AMR frame info, to be fitted into @pjmedia_frame + * bit info. + */ +#pragma pack(1) +typedef struct pjmedia_codec_amr_bit_info { + pj_uint8_t frame_type; /**< AMR frame type. */ + pj_int8_t mode; /**< AMR mode. */ + pj_uint8_t start_bit; /**< Frame start bit. */ + pj_uint8_t good_quality:1; /**< Flag if frame is good/degraded. */ +} pjmedia_codec_amr_bit_info; +#pragma pack() + + +/** + * This structure describes AMR settings. + */ +typedef struct pjmedia_codec_amr_pack_setting { + pj_uint8_t amr_nb:1; /**< Set 1 for AMR-NB, 0 for AMR-WB. */ + pj_uint8_t reorder:1; /**< Reorder bitstream into descending + sensitivity order or vice versa. */ + pj_uint8_t octet_aligned:1; /**< TRUE if payload is in octet-aligned mode, + FALSE if payload is in bandwidth + efficient mode. */ + pj_uint8_t cmr:4; /**< Change Mode Request for remote + encoder. */ +} pjmedia_codec_amr_pack_setting; + + +/** + * Get AMR mode based on bitrate. + * + * @param bitrate AMR bitrate. + * + * @return AMR mode. + */ + +PJ_INLINE(pj_int8_t) pjmedia_codec_amr_get_mode(unsigned bitrate) +{ + pj_int8_t mode = -1; + + if(bitrate==4750){ + mode = 0; + } else if(bitrate==5150){ + mode = 1; + } else if(bitrate==5900){ + mode = 2; + } else if(bitrate==6700){ + mode = 3; + } else if(bitrate==7400){ + mode = 4; + } else if(bitrate==7950){ + mode = 5; + } else if(bitrate==10200){ + mode = 6; + } else if(bitrate==12200){ + mode = 7; + + /* AMRWB */ + } else if(bitrate==6600){ + mode = 0; + } else if(bitrate==8850){ + mode = 1; + } else if(bitrate==12650){ + mode = 2; + } else if(bitrate==14250){ + mode = 3; + } else if(bitrate==15850){ + mode = 4; + } else if(bitrate==18250){ + mode = 5; + } else if(bitrate==19850){ + mode = 6; + } else if(bitrate==23050){ + mode = 7; + } else if(bitrate==23850){ + mode = 8; + } + return mode; +} + +/** + * Prepare a frame before pass it to decoder. This function will do: + * - reorder AMR bitstream from descending sensitivity order into + * encoder bits order. This can be enabled/disabled via param + * 'setting' by setting/resetting field 'reorder'. + * - align left the start bit (make the start_bit to be 0). + * + * @param amr_nb Set PJ_TRUE for AMR-NB and PJ_FALSE for AMR-WB. + * @param in Input frame. + * @param setting Settings, see @pjmedia_codec_amr_pack_setting. + * @param out Output frame. + * + * @return PJ_SUCCESS on success. + */ +PJ_INLINE(pj_status_t) pjmedia_codec_amr_predecode( + const pjmedia_frame *in, + const pjmedia_codec_amr_pack_setting *setting, + pjmedia_frame *out) +{ + pj_int8_t amr_bits[477 + 7] = {0}; + pj_int8_t *p_amr_bits = &amr_bits[0]; + + pj_uint8_t *r = (pj_uint8_t*) in->buf; /* read cursor */ + pj_uint8_t *w = (pj_uint8_t*) out->buf; /* write cursor */ + + /* env vars for AMR or AMRWB */ + pj_uint8_t SID_FT; + const pj_uint8_t *framelen_tbl; + const pj_uint16_t *framelenbit_tbl; + const pj_uint16_t *bitrate_tbl; + const pj_int16_t* const *order_maps; + + pjmedia_codec_amr_bit_info *in_info = + (pjmedia_codec_amr_bit_info*) &in->bit_info; + pjmedia_codec_amr_bit_info *out_info = + (pjmedia_codec_amr_bit_info*) &out->bit_info; + + unsigned i; + + *out_info = *in_info; + + if (setting->amr_nb) { + SID_FT = 8; + framelen_tbl = pjmedia_codec_amrnb_framelen; + framelenbit_tbl = pjmedia_codec_amrnb_framelenbits; + bitrate_tbl = pjmedia_codec_amrnb_bitrates; + order_maps = pjmedia_codec_amrnb_ordermaps; + } else { + SID_FT = 9; + framelen_tbl = pjmedia_codec_amrwb_framelen; + framelenbit_tbl = pjmedia_codec_amrwb_framelenbits; + bitrate_tbl = pjmedia_codec_amrwb_bitrates; + order_maps = pjmedia_codec_amrwb_ordermaps; + } + + /* unpack AMR bitstream if there is any data */ + if (in_info->frame_type <= SID_FT) { + i = 0; + if (in_info->start_bit) { + for (; i < (unsigned)(8-in_info->start_bit); ++i) + *p_amr_bits++ = (pj_uint8_t) + ((*r >> (7-in_info->start_bit-i)) & 1); + ++r; + } + for(; i < framelenbit_tbl[in_info->frame_type]; i += 8, ++r) { + *p_amr_bits++ = (pj_uint8_t)((*r >> 7) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 6) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 5) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 4) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 3) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 2) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 1) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r ) & 1); + } + } + + if (in_info->frame_type < SID_FT) { + + /* Speech */ + out_info->mode = in_info->frame_type; + out->size = framelen_tbl[out_info->mode]; + + pj_bzero(out->buf, out->size); + + if (setting->reorder) { + const pj_int16_t *order_map; + + order_map = order_maps[out_info->mode]; + for(i = 0; i < framelenbit_tbl[out_info->mode]; ++i) { + if (amr_bits[i]) { + pj_uint16_t bitpos; + bitpos = order_map[i]; + w[bitpos>>3] |= 1 << (7 - (bitpos % 8)); + } + } + } else { + for(i = 0; i < framelenbit_tbl[out_info->mode]; ++i) { + if (amr_bits[i]) + w[i >> 3] |= 1 << (7 - (i % 8)); + } + } + + } else if (in_info->frame_type == SID_FT) { + + /* SID */ + pj_uint8_t w_bitptr = 0; + pj_uint8_t FT_; + + if (setting->amr_nb) + FT_ = (pj_uint8_t)((amr_bits[36] << 2) | (amr_bits[37] << 1) | + amr_bits[38]); + else + FT_ = (pj_uint8_t)((amr_bits[36] << 3) | (amr_bits[37] << 2) | + (amr_bits[38] << 1) | amr_bits[39]); + + out_info->mode = FT_; + out->size = 5; + PJ_ASSERT_RETURN(out->size <= in->size, PJMEDIA_CODEC_EFRMINLEN); + + pj_bzero(out->buf, out->size); + for(i = 0; i < framelenbit_tbl[SID_FT]; ++i) { + if (amr_bits[i]) + *w |= (1 << (7-w_bitptr)); + + if (++w_bitptr == 8) { + ++w; + w_bitptr = 0; + } + } + + } else { + + /* NO DATA */ + out->size = 0; + out_info->mode = -1; + } + + out_info->start_bit = 0; + + return PJ_SUCCESS; +} + + +/** + * Pack encoded AMR frame(s) into an RTP payload. + * + * @param frames AMR frames to be packed. + * @param nframes Number of frames to be packed. + * @param setting Settings, see @pjmedia_codec_amr_pack_setting. + * @param pkt Payload. + * @param pkt_size Payload size, as input this specifies payload maximum size, + * as output this specifies payload packed size. + * + * @return PJ_SUCCESS on success. + */ +PJ_INLINE (pj_status_t) pjmedia_codec_amr_pack( + const pjmedia_frame frames[], + unsigned nframes, + const pjmedia_codec_amr_pack_setting *setting, + void *pkt, + pj_size_t *pkt_size) +{ + /* Write cursor */ + pj_uint8_t *w = (pj_uint8_t*)pkt; + pj_uint8_t w_bitptr = 0; + + /* Read cursor */ + pj_uint8_t *r; + + /* env vars for AMR or AMRWB */ + pj_uint8_t SID_FT; + const pj_uint8_t *framelen_tbl; + const pj_uint16_t *framelenbit_tbl; + const pj_uint16_t *bitrate_tbl; + const pj_int16_t* const *order_maps; + + /* frame info */ + pjmedia_codec_amr_bit_info *info; + + unsigned i, max_pkt_size; + + max_pkt_size = *pkt_size; + + if (setting->amr_nb) { + SID_FT = 8; + framelen_tbl = pjmedia_codec_amrnb_framelen; + framelenbit_tbl = pjmedia_codec_amrnb_framelenbits; + bitrate_tbl = pjmedia_codec_amrnb_bitrates; + order_maps = pjmedia_codec_amrnb_ordermaps; + } else { + SID_FT = 9; + framelen_tbl = pjmedia_codec_amrwb_framelen; + framelenbit_tbl = pjmedia_codec_amrwb_framelenbits; + bitrate_tbl = pjmedia_codec_amrwb_bitrates; + order_maps = pjmedia_codec_amrwb_ordermaps; + } + + /* Code Mode Request, 4 bits */ + *w = (pj_uint8_t)(setting->cmr << 4); + w_bitptr = 4; + if (setting->octet_aligned) { + ++w; + w_bitptr = 0; + } + + /* Table Of Contents, 6 bits each */ + for (i = 0; i < nframes; ++i) { + pj_uint8_t TOC, FT, Q; + pj_bool_t F; + + info = (pjmedia_codec_amr_bit_info*)&frames[i].bit_info; + + F = (i != nframes-1); + FT = info->frame_type; + Q = (pj_uint8_t)(info->good_quality == 1); + pj_assert(FT <= SID_FT || FT == 14 || FT == 15); + + /* Check buffer availability */ + *pkt_size = w - (pj_uint8_t*)pkt + 1; + PJ_ASSERT_RETURN(*pkt_size <= max_pkt_size, PJ_ETOOSMALL); + + TOC = (pj_uint8_t)((F<<5) | (FT<<1) | Q); + if (w_bitptr == 0) { + *w = (pj_uint8_t)(TOC<<2); + w_bitptr = 6; + } else if (w_bitptr == 2) { + *w++ |= TOC; + w_bitptr = 0; + } else if (w_bitptr == 4) { + *w++ |= TOC>>2; + *w = (pj_uint8_t)(TOC<<6); + w_bitptr = 2; + } else if (w_bitptr == 6) { + *w++ |= TOC>>4; + *w = (pj_uint8_t)(TOC<<4); + w_bitptr = 4; + } + if (setting->octet_aligned) { + ++w; + w_bitptr = 0; + } + } + + /* Encoded data */ + for (i = 0; i < nframes; ++i) { + pj_int8_t amr_bits[477 + 7] = {0}; + pj_int8_t *p_amr_bits = &amr_bits[0]; + unsigned j; + + info = (pjmedia_codec_amr_bit_info*)&frames[i].bit_info; + + /* Check buffer availability */ + *pkt_size = w - (pj_uint8_t*)pkt; + if (info->frame_type <= SID_FT) + *pkt_size += framelen_tbl[info->frame_type] + 1; + PJ_ASSERT_RETURN(*pkt_size <= max_pkt_size, PJ_ETOOSMALL); + + /* Skip if there is no data */ + if (info->frame_type > SID_FT) + continue; + + /* Unpack bits */ + r = (pj_uint8_t*) frames[i].buf; + j = 0; + if (info->start_bit) { + for (; j < (unsigned)(8-info->start_bit); ++j) + *p_amr_bits++ = (pj_uint8_t) + ((*r >> (7-info->start_bit-j)) & 1); + ++r; + } + for(; j < framelenbit_tbl[info->frame_type]; j+=8, ++r) { + *p_amr_bits++ = (pj_uint8_t)((*r >> 7) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 6) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 5) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 4) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 3) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 2) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r >> 1) & 1); + *p_amr_bits++ = (pj_uint8_t)((*r ) & 1); + } + + if (info->frame_type < SID_FT) { + + /* Speech */ + if (w_bitptr == 0) *w = 0; + + if (setting->reorder) { + const pj_int16_t *order_map; + + /* Put bits in the packet, sensitivity descending ordered */ + order_map = order_maps[info->frame_type]; + for(j = 0; j < framelenbit_tbl[info->frame_type]; ++j) { + if (amr_bits[order_map[j]]) + *w |= (1 << (7-w_bitptr)); + + if (++w_bitptr == 8) { + w_bitptr = 0; + ++w; + *w = 0; + } + } + } else { + for(j = 0; j < framelenbit_tbl[info->frame_type]; ++j) { + if (amr_bits[j]) + *w |= (1 << (7-w_bitptr)); + + if (++w_bitptr == 8) { + w_bitptr = 0; + ++w; + *w = 0; + } + } + } + + } else if (info->frame_type == SID_FT) { + + /* SID */ + pj_uint8_t STI = 0; + + amr_bits[35] = (pj_uint8_t)(STI & 1); + + if (setting->amr_nb) { + amr_bits[36] = (pj_uint8_t)((info->mode >> 2) & 1); + amr_bits[37] = (pj_uint8_t)((info->mode >> 1) & 1); + amr_bits[38] = (pj_uint8_t)((info->mode) & 1); + } else { + amr_bits[36] = (pj_uint8_t)((info->mode >> 3) & 1); + amr_bits[37] = (pj_uint8_t)((info->mode >> 2) & 1); + amr_bits[38] = (pj_uint8_t)((info->mode >> 1) & 1); + amr_bits[39] = (pj_uint8_t)((info->mode) & 1); + } + + if (w_bitptr == 0) *w = 0; + for(j = 0; j < framelenbit_tbl[info->frame_type]; ++j) { + if (amr_bits[j]) + *w |= (1 << (7-w_bitptr)); + + if (++w_bitptr == 8) { + w_bitptr = 0; + ++w; + *w = 0; + } + } + } + + if (setting->octet_aligned) { + ++w; + w_bitptr = 0; + } + } + + *pkt_size = w - (pj_uint8_t*)pkt; + if (w_bitptr) + *pkt_size += 1; + + return PJ_SUCCESS; +} + + +/** + * Parse AMR payload into frames. + * + * @param pkt Payload. + * @param pkt_size Payload size. + * @param ts Base timestamp. + * @param setting Settings, see @pjmedia_codec_amr_pack_setting. + * @param frames Frames parsed. + * @param nframes Number of frames parsed. + * @param cmr Change Mode Request message for local encoder. + * + * @return PJ_SUCCESS on success. + */ +PJ_INLINE(pj_status_t) pjmedia_codec_amr_parse( + void *pkt, + pj_size_t pkt_size, + const pj_timestamp *ts, + const pjmedia_codec_amr_pack_setting* setting, + pjmedia_frame frames[], + unsigned *nframes, + pj_uint8_t *cmr) +{ + unsigned cnt = 0; + pj_timestamp ts_ = *ts; + + /* Read cursor */ + pj_uint8_t r_bitptr = 0; + pj_uint8_t *r = (pj_uint8_t*)pkt; + + /* env vars for AMR or AMRWB */ + pj_uint8_t SID_FT; + const pj_uint8_t *framelen_tbl; + const pj_uint16_t *framelenbit_tbl; + const pj_int16_t* const *order_maps; + + /* frame info */ + pjmedia_codec_amr_bit_info *info; + + if (setting->amr_nb) { + SID_FT = 8; + framelen_tbl = pjmedia_codec_amrnb_framelen; + framelenbit_tbl = pjmedia_codec_amrnb_framelenbits; + order_maps = pjmedia_codec_amrnb_ordermaps; + } else { + SID_FT = 9; + framelen_tbl = pjmedia_codec_amrwb_framelen; + framelenbit_tbl = pjmedia_codec_amrwb_framelenbits; + order_maps = pjmedia_codec_amrwb_ordermaps; + } + + PJ_UNUSED_ARG(pkt_size); + + /* Code Mode Request, 4 bits */ + *cmr = (pj_uint8_t)((*r >> 4) & 0x0F); + r_bitptr = 4; + if (setting->octet_aligned) { + ++r; + r_bitptr = 0; + } + + /* Table Of Contents, 6 bits each */ + for (;;) { + pj_uint8_t TOC = 0; + pj_uint8_t F, FT, Q; + + if (r_bitptr == 0) { + TOC = (pj_uint8_t)(*r >> 2); + r_bitptr = 6; + } else if (r_bitptr == 2) { + TOC = (pj_uint8_t)(*r++ & 0x3F); + r_bitptr = 0; + } else if (r_bitptr == 4) { + TOC = (pj_uint8_t)((*r++ & 0x0f) << 2); + TOC |= *r >> 6; + r_bitptr = 2; + } else if (r_bitptr == 6) { + TOC = (pj_uint8_t)((*r++ & 0x03) << 4); + TOC |= *r >> 4; + r_bitptr = 4; + } + + F = (pj_uint8_t)(TOC >> 5); + FT = (pj_uint8_t)((TOC >> 1) & 0x0F); + Q = (pj_uint8_t)(TOC & 1); + + if (FT > SID_FT && FT < 14) { + pj_assert(!"Invalid AMR frametype, stream may be corrupted!"); + break; + } + + if (setting->octet_aligned) { + ++r; + r_bitptr = 0; + } + + /* Set frame attributes */ + info = (pjmedia_codec_amr_bit_info*) &frames[cnt].bit_info; + info->frame_type = FT; + info->mode = (pj_int8_t)((FT < SID_FT)? FT : -1); + info->good_quality = (pj_uint8_t)(Q == 1); + info->start_bit = 0; + frames[cnt].timestamp = ts_; + frames[cnt].type = PJMEDIA_FRAME_TYPE_AUDIO; + + /* AMR frame length is 20ms */ + ts_.u64 += setting->amr_nb? 160 : 320; + + if (++cnt == *nframes || !F) + break; + } + *nframes = cnt; + + cnt = 0; + + /* Speech frames */ + while (cnt < *nframes) { + pj_uint8_t FT; + + info = (pjmedia_codec_amr_bit_info*) &frames[cnt].bit_info; + FT = info->frame_type; + + frames[cnt].buf = r; + info->start_bit = r_bitptr; + + if (setting->octet_aligned) { + r += framelen_tbl[FT]; + frames[cnt].size = framelen_tbl[FT]; + } else { + if (FT == 14 || FT == 15) { + /* NO DATA */ + frames[cnt].size = 0; + } else { + unsigned adv_bit; + + adv_bit = framelenbit_tbl[FT] + r_bitptr; + r += adv_bit >> 3; + r_bitptr = (pj_uint8_t)(adv_bit % 8); + + frames[cnt].size = adv_bit >> 3; + if (r_bitptr) + ++frames[cnt].size; + } + } + ++cnt; + } + + return PJ_SUCCESS; +} + + +PJ_END_DECL + +/** + * @} + */ + +#endif /* __PJMEDIA_CODECS_AMR_HELPER_H__ */ diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/config.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config.h similarity index 96% rename from libs/pjproject-1.0/pjmedia/include/pjmedia-codec/config.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config.h index 152aa7f4be6a53afcc759663a1befe825fe074c3..88847b9c4e01e6071aa94266e680ecf7570bc0f4 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/config.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config.h @@ -1,6 +1,7 @@ -/* $Id: config.h 2225 2008-08-19 15:01:48Z bennylp $ */ +/* $Id: config.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h new file mode 100644 index 0000000000000000000000000000000000000000..dce3d656a99f8fd0a857e40f4781068de96d3338 --- /dev/null +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h @@ -0,0 +1,67 @@ +/* pjmedia/include/pjmedia-codec/config_auto.h. Generated by configure. */ +/* $Id: config_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ +/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __PJMEDIA_CODEC_CONFIG_AUTO_H_ +#define __PJMEDIA_CODEC_CONFIG_AUTO_H_ + +/** + * @file config_auto.h + * @brief PJMEDIA-CODEC configuration as set by autoconf script + */ + +/* + * Note: + * The configuration in config_site.h overrides any other settings, + * including the setting as detected by autoconf. + */ + +/* L16 codec */ +#ifndef PJMEDIA_HAS_L16_CODEC +/* #undef PJMEDIA_HAS_L16_CODEC */ +#endif + + +/* GSM codec */ +#ifndef PJMEDIA_HAS_GSM_CODEC +/* #undef PJMEDIA_HAS_GSM_CODEC */ +#endif + + +/* Speex codec */ +#ifndef PJMEDIA_HAS_SPEEX_CODEC +/* #undef PJMEDIA_HAS_SPEEX_CODEC */ +#endif + + +/* iLBC codec */ +#ifndef PJMEDIA_HAS_ILBC_CODEC +/* #undef PJMEDIA_HAS_ILBC_CODEC */ +#endif + + +/* G722 codec */ +#ifndef PJMEDIA_HAS_G722_CODEC +/* #undef PJMEDIA_HAS_G722_CODEC */ +#endif + + +#endif /* __PJMEDIA_CODEC_CONFIG_AUTO_H_ */ + + diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/config_auto.h.in b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h.in similarity index 89% rename from libs/pjproject-1.0/pjmedia/include/pjmedia-codec/config_auto.h.in rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h.in index 0faff81a893bc05790061bfd8b8d688cbc8a61dc..a1cc8b0b792d68be30e560e4079fe7e5bd67820c 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/config_auto.h.in +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h.in @@ -1,6 +1,7 @@ -/* $Id: config_auto.h.in 1871 2008-03-17 14:24:21Z bennylp $ */ +/* $Id: config_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/g722.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/g722.h similarity index 91% rename from libs/pjproject-1.0/pjmedia/include/pjmedia-codec/g722.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/g722.h index 0f0bb806b3fdb3b312c01d41d146f62711e39df0..27a9491402397bea7c6ce2ba44c5d5020bdbe3a3 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/g722.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/g722.h @@ -1,6 +1,7 @@ -/* $Id: g722.h 2037 2008-06-20 21:39:02Z bennylp $ */ +/* $Id: g722.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/gsm.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/gsm.h similarity index 91% rename from libs/pjproject-1.0/pjmedia/include/pjmedia-codec/gsm.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/gsm.h index 67937679912ce8d1f0a5bf278a137c6334695080..d528b5fc3382d03305d68f022ce94fc74f3bb6ba 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/gsm.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/gsm.h @@ -1,6 +1,7 @@ -/* $Id: gsm.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: gsm.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/ilbc.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/ilbc.h similarity index 91% rename from libs/pjproject-1.0/pjmedia/include/pjmedia-codec/ilbc.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/ilbc.h index 26534c2c73546d089e943de8c79ce9ce7ee63e4e..d14b3af2491f66f7a55ec9c2c107f1bc936e1cac 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/ilbc.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/ilbc.h @@ -1,6 +1,7 @@ -/* $Id: ilbc.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ilbc.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/ipp_codecs.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/ipp_codecs.h similarity index 91% rename from libs/pjproject-1.0/pjmedia/include/pjmedia-codec/ipp_codecs.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/ipp_codecs.h index a41929302bef3bf49372fd4ecbaa54fb6cd45cd8..a67b3392f88ca09cf27f155a7b5353b43f44b2ae 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/ipp_codecs.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/ipp_codecs.h @@ -1,6 +1,7 @@ -/* $Id: ipp_codecs.h 2216 2008-08-15 13:17:39Z nanang $ */ +/* $Id: ipp_codecs.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/l16.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/l16.h similarity index 91% rename from libs/pjproject-1.0/pjmedia/include/pjmedia-codec/l16.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/l16.h index ce4ec9bc7faee4aa4498000c38568e925cf9b820..8d1f80486c3ab59c88e2eefd19981568c99bbcf4 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/l16.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/l16.h @@ -1,6 +1,7 @@ -/* $Id: l16.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: l16.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/speex.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/speex.h similarity index 95% rename from libs/pjproject-1.0/pjmedia/include/pjmedia-codec/speex.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/speex.h index 9f866ddd7d95f8cea9df504cbe144e4d3a29e6c7..ba8b35346b2e82bd11bddf5be54ab121f24abdae 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/speex.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/speex.h @@ -1,6 +1,7 @@ -/* $Id: speex.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: speex.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/types.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/types.h similarity index 94% rename from libs/pjproject-1.0/pjmedia/include/pjmedia-codec/types.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/types.h index c82ebf9f13ccd6fb23fdb339aa7f3939408f7c93..7c3efc64b457a56917db8b991e7338bc8ab0386f 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia-codec/types.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/types.h @@ -1,6 +1,7 @@ -/* $Id: types.h 2236 2008-08-25 13:58:25Z nanang $ */ +/* $Id: types.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia.h similarity index 94% rename from libs/pjproject-1.0/pjmedia/include/pjmedia.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia.h index c18248a01712111b1ce0d4e8006ce0c1134de5b7..c87563582f501f72c87d2daef0f0a2906f907567 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia.h @@ -1,5 +1,6 @@ -/* $Id: pjmedia.h 2262 2008-09-04 13:55:33Z bennylp $ */ +/* $Id: pjmedia.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/alaw_ulaw.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/alaw_ulaw.h similarity index 96% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/alaw_ulaw.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/alaw_ulaw.h index 587e3470dce933806fea7573d13b5bffdc772dff..94483c9ee28e78ebb324bf2fd8d633cab4188e58 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/alaw_ulaw.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/alaw_ulaw.h @@ -1,5 +1,6 @@ -/* $Id: alaw_ulaw.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: alaw_ulaw.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/bidirectional.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/bidirectional.h similarity index 93% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/bidirectional.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/bidirectional.h index 334385a854fe5d7aa0a6d0ab233f791000fc5ce8..e43db513a727b15a1f0c1c6efe1e325e222337cf 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/bidirectional.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/bidirectional.h @@ -1,5 +1,6 @@ -/* $Id: bidirectional.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: bidirectional.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/circbuf.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/circbuf.h similarity index 99% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/circbuf.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/circbuf.h index c31a2e92b475704031fa5083e273e6db095a394c..0e7d83b2a94574e91f61386237a3d296768e440f 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/circbuf.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/circbuf.h @@ -1,5 +1,6 @@ -/* $Id: circbuf.h 2114 2008-07-10 10:46:34Z nanang $ */ +/* $Id: circbuf.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/clock.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/clock.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/clock.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/clock.h index a3cea3cd41ddf022beb07aceeeac0d25b170a80d..c9c9b54f19bb184214c0680f89020f9897a02345 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/clock.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/clock.h @@ -1,5 +1,6 @@ -/* $Id: clock.h 2075 2008-06-27 16:18:13Z nanang $ */ +/* $Id: clock.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/codec.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/codec.h similarity index 99% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/codec.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/codec.h index 379ce490335116bb9a320486b22b3d8d205c886f..38525094650566f575f93234539ef481acc25df1 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/codec.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/codec.h @@ -1,5 +1,6 @@ -/* $Id: codec.h 2236 2008-08-25 13:58:25Z nanang $ */ +/* $Id: codec.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/conference.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/conference.h similarity index 99% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/conference.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/conference.h index bcb9370891fdf314f3cf0727a5840e11e1b274df..3206ce614b886520d6e0fc95635f3971c1b4f7b6 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/conference.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/conference.h @@ -1,5 +1,6 @@ -/* $Id: conference.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: conference.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/config.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/config.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/config.h index dd91af4c02fb5535a28dfd01d5ae548370411040..866359e4c1a64489a0e49b6366d90a88725e35ac 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/config.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config.h @@ -1,5 +1,6 @@ -/* $Id: config.h 2294 2008-09-18 14:11:29Z bennylp $ */ +/* $Id: config.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -425,7 +426,7 @@ /** * Suggested or default threshold to be set for fixed silence detection * or as starting threshold for adaptive silence detection. The threshold - * has the range from zero to 255. + * has the range from zero to 0xFFFF. */ #ifndef PJMEDIA_SILENCE_DET_THRESHOLD # define PJMEDIA_SILENCE_DET_THRESHOLD 4 @@ -437,10 +438,12 @@ * will not cut the audio transmission if the audio level is above this * level. * - * Default: 25 + * Use 0x10000 (or greater) to disable this feature. + * + * Default: 0x10000 (disabled) */ #ifndef PJMEDIA_SILENCE_DET_MAX_THRESHOLD -# define PJMEDIA_SILENCE_DET_MAX_THRESHOLD 25 +# define PJMEDIA_SILENCE_DET_MAX_THRESHOLD 0x10000 #endif diff --git a/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h new file mode 100644 index 0000000000000000000000000000000000000000..e88f6b957d5632144858e0b6f1f5b2bda0f09cf3 --- /dev/null +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h @@ -0,0 +1,44 @@ +/* pjmedia/include/pjmedia/config_auto.h. Generated by configure. */ +/* $Id: config_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ +/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __PJMEDIA_CONFIG_AUTO_H_ +#define __PJMEDIA_CONFIG_AUTO_H_ + +/** + * @file config_auto.h + * @brief PJMEDIA configuration as set by autoconf script + */ + +/* + * Note: + * The configuration in config_site.h overrides any other settings, + * including the setting as detected by autoconf. + */ + +/* G711 codec */ +#ifndef PJMEDIA_HAS_G711_CODEC +/* #undef PJMEDIA_HAS_G711_CODEC */ +#endif + + +#endif /* __PJMEDIA_CONFIG_AUTO_H_ */ + + + diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/config_auto.h.in b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h.in similarity index 86% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/config_auto.h.in rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h.in index 0e3628316638b6cb6531339855bfee9f328e0b2c..ea76f50f593830c8f6d6f5023f423b070802592f 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/config_auto.h.in +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h.in @@ -1,6 +1,7 @@ -/* $Id: config_auto.h.in 909 2007-01-27 17:44:13Z bennylp $ */ +/* $Id: config_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/delaybuf.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/delaybuf.h similarity index 97% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/delaybuf.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/delaybuf.h index fa8dce9c5fa5a418e3e129b303016ead04380615..1fe4abadaefb46b1a392a9455cb66e71cb7ee490 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/delaybuf.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/delaybuf.h @@ -1,5 +1,6 @@ -/* $Id: delaybuf.h 2116 2008-07-10 15:04:27Z nanang $ */ +/* $Id: delaybuf.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/doxygen.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/doxygen.h similarity index 97% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/doxygen.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/doxygen.h index a63126fd0e6082234157b79094ee6bebb4ed59a1..66704aab6bacff6e51ea7a4aeafaf4ac6188eaf2 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/doxygen.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/doxygen.h @@ -1,6 +1,7 @@ -/* $Id: doxygen.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: doxygen.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/echo.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/echo.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/echo.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/echo.h index 535e618b640d6b0ca046b9915aa0b41d559d83ba..ce98371f7e1e1187917eae7b0a0165aa63b89644 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/echo.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/echo.h @@ -1,5 +1,6 @@ -/* $Id: echo.h 2198 2008-08-09 05:40:22Z bennylp $ */ +/* $Id: echo.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/echo_port.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/echo_port.h similarity index 94% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/echo_port.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/echo_port.h index 75bfc3965610da32f5418cae0ef4d667a75e6734..dc524cd21ed117811e1ef63ec6770f9a815d2613 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/echo_port.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/echo_port.h @@ -1,5 +1,6 @@ -/* $Id: echo_port.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: echo_port.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/endpoint.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/endpoint.h similarity index 97% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/endpoint.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/endpoint.h index d3ef2b3e5d5fc7b9bb967feecb610d7b8e5b37e2..27f6455e3f5664e4c0f2e44df0303c519e7f57ae 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/endpoint.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/endpoint.h @@ -1,5 +1,6 @@ -/* $Id: endpoint.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: endpoint.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/errno.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/errno.h similarity index 99% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/errno.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/errno.h index baadbb06a795ce87f0d9f9ae29c03fdb0c5e4c52..b1fd018495b520b3c657330fa9753f7ff101a883 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/errno.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/errno.h @@ -1,5 +1,6 @@ -/* $Id: errno.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: errno.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/g711.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/g711.h similarity index 90% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/g711.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/g711.h index 4985df21994651cf551e677b3e1cb47763fd5cd2..3b98265972528ebe36f132dccc7d9a7f3fc255cc 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/g711.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/g711.h @@ -1,6 +1,7 @@ -/* $Id: g711.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: g711.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/jbuf.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/jbuf.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/jbuf.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/jbuf.h index b698e5e4ad8dd798d922c0a976c4caa74a2b741a..a941ae0d8112addf80a7bba602d2ef155fd561d6 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/jbuf.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/jbuf.h @@ -1,5 +1,6 @@ -/* $Id: jbuf.h 2317 2008-09-24 17:27:46Z nanang $ */ +/* $Id: jbuf.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/master_port.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/master_port.h similarity index 97% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/master_port.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/master_port.h index 213be85754eb43659bf976e0ff8aa9a622da8d29..ddd63ba750e9057be15d9e28cb8686ca295c3db0 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/master_port.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/master_port.h @@ -1,5 +1,6 @@ -/* $Id: master_port.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: master_port.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/mem_port.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/mem_port.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/mem_port.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/mem_port.h index 8d27a991de43df604e7760de714c3c6fdd126c48..9bae66835b319befff4f93eae7f5e87133380920 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/mem_port.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/mem_port.h @@ -1,5 +1,6 @@ -/* $Id: mem_port.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: mem_port.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/null_port.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/null_port.h similarity index 93% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/null_port.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/null_port.h index 689f69c1e6812a9275c41d0508008a2454fcebac..361b0e8835c6a87f22f5fdb6ff312cf912a75010 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/null_port.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/null_port.h @@ -1,5 +1,6 @@ -/* $Id: null_port.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: null_port.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/plc.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/plc.h similarity index 96% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/plc.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/plc.h index 6c88db6b571846a1c432bcdb11bc891260fdd8be..18723b8fc01294f6b0af09c1907158991c3b7279 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/plc.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/plc.h @@ -1,5 +1,6 @@ -/* $Id: plc.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: plc.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/port.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/port.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/port.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/port.h index 3b34165b957811a4efba01a62d4b674e6f205662..101d2b357030de2e1ab33660a312c7b523f3d0a1 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/port.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/port.h @@ -1,5 +1,6 @@ -/* $Id: port.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: port.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/resample.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/resample.h similarity index 97% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/resample.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/resample.h index e09a319568ef6ec77a16a0d1a39c569f4bdae1b5..17b9bc6283fc5650431caadc486b32a9bc11b42e 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/resample.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/resample.h @@ -1,5 +1,6 @@ -/* $Id: resample.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: resample.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/rtcp.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtcp.h similarity index 99% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/rtcp.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtcp.h index c2543a16bfc1fcecac66f5704393f981b184c63d..7a81d07d3028c102aa2b204e04d8275f6cc6bb78 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/rtcp.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtcp.h @@ -1,5 +1,6 @@ -/* $Id: rtcp.h 2241 2008-08-26 16:51:28Z nanang $ */ +/* $Id: rtcp.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/rtcp_xr.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtcp_xr.h similarity index 99% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/rtcp_xr.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtcp_xr.h index f019c6d8b1d36ca8811c1b890ace96873510e04f..acd5c4c0c2f8393294a5410123cee74aca6312bc 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/rtcp_xr.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtcp_xr.h @@ -1,5 +1,6 @@ -/* $Id: rtcp_xr.h 2037 2008-06-20 21:39:02Z bennylp $ */ +/* $Id: rtcp_xr.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/rtp.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtp.h similarity index 99% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/rtp.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtp.h index ac2e95856e4b98b1fa9b7be2dcd3c796ee994f23..20d51c0c5769977838dd85578ca69edb5057342e 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/rtp.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtp.h @@ -1,5 +1,6 @@ -/* $Id: rtp.h 2241 2008-08-26 16:51:28Z nanang $ */ +/* $Id: rtp.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/sdp.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sdp.h similarity index 99% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/sdp.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/sdp.h index af8c9f01a321ddc79f07c9a44a30e24b6e50f881..8abfb125d0dbc7aaaf2b1d899f7a0dce8f12ea92 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/sdp.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sdp.h @@ -1,5 +1,6 @@ -/* $Id: sdp.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sdp.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/sdp_neg.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sdp_neg.h similarity index 99% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/sdp_neg.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/sdp_neg.h index 1104da4fe27a2d57b41d030d23bf8eca3f6865a1..f3796154641cecb6eb48f8af6f8dac73d513c9eb 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/sdp_neg.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sdp_neg.h @@ -1,5 +1,6 @@ -/* $Id: sdp_neg.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sdp_neg.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/session.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/session.h similarity index 99% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/session.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/session.h index 02bd5846b8fbc42a690ae9ad56ae50482ccfc89e..b0519c7d287a2fbe499a3388e9011644f351f38f 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/session.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/session.h @@ -1,5 +1,6 @@ -/* $Id: session.h 2152 2008-07-17 14:54:03Z nanang $ */ +/* $Id: session.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/silencedet.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/silencedet.h similarity index 96% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/silencedet.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/silencedet.h index fae8753c99fe7065944a8362afc40910bd3b461c..f424638947fa2de5bee5d81db571002b434a2601 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/silencedet.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/silencedet.h @@ -1,6 +1,7 @@ -/* $Id: silencedet.h 2222 2008-08-19 11:04:32Z nanang $ */ +/* $Id: silencedet.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/sound.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sound.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/sound.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/sound.h index 6769e48ace9813bb6830e8988cc8dbb06a4ea500..2d5efe8fc6f8f262e8a6dd31de833c60d43741f3 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/sound.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sound.h @@ -1,5 +1,6 @@ -/* $Id: sound.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sound.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/sound_port.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sound_port.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/sound_port.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/sound_port.h index 875c28cc357db53ec52ff196bead5529cb7c981a..d3732e04f3c2dfce8e06a0e72184c5bfa14aa448 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/sound_port.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sound_port.h @@ -1,5 +1,6 @@ -/* $Id: sound_port.h 2166 2008-07-22 10:36:38Z bennylp $ */ +/* $Id: sound_port.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/splitcomb.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/splitcomb.h similarity index 97% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/splitcomb.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/splitcomb.h index 0d8deef8507629b50d8ed34d203009995422f4a8..f1b1ccfc91a08e81f81acb493bffbe0a65f4024e 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/splitcomb.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/splitcomb.h @@ -1,5 +1,6 @@ -/* $Id: splitcomb.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: splitcomb.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/stereo.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/stereo.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/stereo.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/stereo.h index 32f9ca8bb847df05ab26ea426ef6676144bf13c0..405384b40a660b9c493434cfd1a42a6a56b99611 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/stereo.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/stereo.h @@ -1,5 +1,6 @@ -/* $Id: stereo.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: stereo.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/stream.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/stream.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/stream.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/stream.h index 8d8f3f86d7a62fd0a822bc64c7407294dfb76111..1f928da9ed2a44cd17ccf98e24c36edb057c5f44 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/stream.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/stream.h @@ -1,5 +1,6 @@ -/* $Id: stream.h 2241 2008-08-26 16:51:28Z nanang $ */ +/* $Id: stream.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/symbian_sound_aps.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/symbian_sound_aps.h similarity index 92% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/symbian_sound_aps.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/symbian_sound_aps.h index d22c12f705af5903233c35e7871de7b2b5a4187b..a8434dd58813e16978fa279c482c886133e1545f 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/symbian_sound_aps.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/symbian_sound_aps.h @@ -1,5 +1,6 @@ -/* $Id: symbian_sound_aps.h 2174 2008-07-24 15:30:44Z nanang $ */ +/* $Id: symbian_sound_aps.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/tonegen.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/tonegen.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/tonegen.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/tonegen.h index 03efa1018963c599eda41fc72b5104d1e9d233db..ec9e13f67207ae41527ef830107b2889d4045e6d 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/tonegen.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/tonegen.h @@ -1,5 +1,6 @@ -/* $Id: tonegen.h 2313 2008-09-24 09:38:55Z bennylp $ */ +/* $Id: tonegen.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport.h similarity index 99% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/transport.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport.h index bd83fcdb96e04608b079b7919f94f8087ca539c9..0536f51d59f9fbddeb6aa698fe10b26e6eb101d0 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport.h @@ -1,5 +1,6 @@ -/* $Id: transport.h 2293 2008-09-18 12:58:33Z nanang $ */ +/* $Id: transport.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -541,8 +542,8 @@ PJ_INLINE(pj_status_t) pjmedia_transport_get_info(pjmedia_transport *tp, { if (tp && tp->op && tp->op->get_info) return (*tp->op->get_info)(tp, info); - else - return PJ_ENOTSUP; + + return PJ_ENOTSUP; } diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport_adapter_sample.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_adapter_sample.h similarity index 94% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/transport_adapter_sample.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_adapter_sample.h index 20ca15112df6a2d98541bce5bb5c2806ffc7c392..912a7a74d36913cd795497046b0738cd5160e279 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport_adapter_sample.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_adapter_sample.h @@ -1,5 +1,6 @@ -/* $Id: transport_adapter_sample.h 2262 2008-09-04 13:55:33Z bennylp $ */ +/* $Id: transport_adapter_sample.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport_ice.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_ice.h similarity index 97% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/transport_ice.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_ice.h index fc2f68891163f3f87a86ba0a3f182ec83dfaeeae..1c19b377bd5d29c0ebf74557fd785385478ff567 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport_ice.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_ice.h @@ -1,5 +1,6 @@ -/* $Id: transport_ice.h 2276 2008-09-11 18:43:59Z nanang $ */ +/* $Id: transport_ice.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport_loop.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_loop.h similarity index 92% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/transport_loop.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_loop.h index c49af3214a498bee66499be1c47354d70b59ce66..7da071764f368500c39d9a2a44a060cc85280d8c 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport_loop.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_loop.h @@ -1,5 +1,6 @@ -/* $Id: transport_loop.h 2101 2008-07-04 16:45:17Z bennylp $ */ +/* $Id: transport_loop.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport_srtp.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_srtp.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/transport_srtp.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_srtp.h index c3caa8d34e185636a921b91bd9f5346dd3b1a72f..d51f6c73d2f619fbbedc896d7c927cfec6a3c843 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport_srtp.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_srtp.h @@ -1,5 +1,6 @@ -/* $Id: transport_srtp.h 2064 2008-06-26 19:12:09Z nanang $ */ +/* $Id: transport_srtp.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport_udp.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_udp.h similarity index 97% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/transport_udp.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_udp.h index 0ae013378b161620e696154fe069ed4516c4f498..071e87e34cbf48b8809ecb038d975280c2e55a38 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/transport_udp.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_udp.h @@ -1,5 +1,6 @@ -/* $Id: transport_udp.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: transport_udp.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/types.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/types.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/types.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/types.h index 060a38cc3ea94d726100e2812914989635c5501f..ef31a819991910cd24349539e8b36138f75ef20a 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/types.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/types.h @@ -1,5 +1,6 @@ -/* $Id: types.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: types.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/wav_playlist.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wav_playlist.h similarity index 96% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/wav_playlist.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/wav_playlist.h index 6cc8498e5556245f1bd01205fa02fdfc167eb5d1..a45197cd514ef121009f4453b8da922f0a4e4412 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/wav_playlist.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wav_playlist.h @@ -1,5 +1,6 @@ -/* $Id: wav_playlist.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: wav_playlist.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/wav_port.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wav_port.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/wav_port.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/wav_port.h index e7d6e331da537955301d5dc86c1e28ea4f3a0031..dac10fef7cdca2fca4f2ddccf022e0632a56d42a 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/wav_port.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wav_port.h @@ -1,5 +1,6 @@ -/* $Id: wav_port.h 2275 2008-09-11 17:38:48Z nanang $ */ +/* $Id: wav_port.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/wave.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wave.h similarity index 97% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/wave.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/wave.h index b75d53bb1d56d2d0d0645155518042099cbb0c21..adb2a01c99f593d2d72225a32507018fcda691ce 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/wave.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wave.h @@ -1,5 +1,6 @@ -/* $Id: wave.h 2270 2008-09-10 19:48:45Z nanang $ */ +/* $Id: wave.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/include/pjmedia/wsola.h b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wsola.h similarity index 98% rename from libs/pjproject-1.0/pjmedia/include/pjmedia/wsola.h rename to libs/pjproject-1.0.1/pjmedia/include/pjmedia/wsola.h index e9dbc7df30955802b8210b51106622676ff8e4f1..619cbaadd7b0a3982123d157ab321e16932781a4 100644 --- a/libs/pjproject-1.0/pjmedia/include/pjmedia/wsola.h +++ b/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wsola.h @@ -1,5 +1,6 @@ -/* $Id: wsola.h 2115 2008-07-10 14:59:57Z nanang $ */ +/* $Id: wsola.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722.c similarity index 97% rename from libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722.c index cff71efd87b4d6bd126de65970c4020625d54ae0..033317d608e1a6e3eb1be4e1b9ae9112e237ab6f 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722.c @@ -1,6 +1,7 @@ -/* $Id: g722.c 2298 2008-09-19 21:17:30Z nanang $ */ +/* $Id: g722.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -626,7 +627,7 @@ static pj_status_t g722_codec_decode(pjmedia_codec *codec, #if !PLC_DISABLED if (g722_data->plc_enabled) - pjmedia_plc_save(g722_data->plc, output->buf); + pjmedia_plc_save(g722_data->plc, (pj_int16_t*)output->buf); #endif TRACE_((THIS_FILE, "G722 decode done")); @@ -642,14 +643,14 @@ static pj_status_t g722_codec_recover(pjmedia_codec *codec, unsigned output_buf_len, struct pjmedia_frame *output) { - struct g722_data *g722_data = codec->codec_data; + struct g722_data *g722_data = (struct g722_data*)codec->codec_data; PJ_ASSERT_RETURN(g722_data->plc_enabled, PJ_EINVALIDOP); PJ_ASSERT_RETURN(output_buf_len >= SAMPLES_PER_FRAME * 2, PJMEDIA_CODEC_EPCMTOOSHORT); - pjmedia_plc_generate(g722_data->plc, output->buf); + pjmedia_plc_generate(g722_data->plc, (pj_int16_t*)output->buf); output->size = SAMPLES_PER_FRAME * 2; output->type = PJMEDIA_FRAME_TYPE_AUDIO; diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_dec.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_dec.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_dec.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_dec.c index b9d0c8ff7857958b028ec5678a3a6fee59d51873..ef4b6920dde66c4516f4409b90e888da3228714d 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_dec.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_dec.c @@ -1,6 +1,7 @@ -/* $Id: g722_dec.c 2342 2008-10-06 18:42:13Z nanang $ */ +/* $Id: g722_dec.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_dec.h b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_dec.h similarity index 91% rename from libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_dec.h rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_dec.h index c8329a7811706d91ab73a519b1308123d4c95be5..8d88e2571f958634e6a985ce428cb1f8dc46799c 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_dec.h +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_dec.h @@ -1,6 +1,7 @@ -/* $Id: g722_dec.h 1870 2008-03-17 14:07:53Z bennylp $ */ +/* $Id: g722_dec.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_enc.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_enc.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_enc.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_enc.c index 50568b333df87a563d276b014f2d4b6d519412ac..c10e09a984eeed66dcc23a4f9c2d09829c9cc454 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_enc.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_enc.c @@ -1,6 +1,7 @@ -/* $Id: g722_enc.c 2342 2008-10-06 18:42:13Z nanang $ */ +/* $Id: g722_enc.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_enc.h b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_enc.h similarity index 91% rename from libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_enc.h rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_enc.h index c207c3320429687e84465082f183ca71f1cd2d03..628ffc1825ae996bb951503dab6a114bf31ee8d4 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/g722/g722_enc.h +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_enc.h @@ -1,6 +1,7 @@ -/* $Id: g722_enc.h 1870 2008-03-17 14:07:53Z bennylp $ */ +/* $Id: g722_enc.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/gsm.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/gsm.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia-codec/gsm.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/gsm.c index e072e822347bc1c18edf1ce4578b099ef76cef39..19e6b0394c950cc7bb7b7d50e27cd2d45690b89b 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/gsm.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/gsm.c @@ -1,6 +1,7 @@ -/* $Id: gsm.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: gsm.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/ilbc.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/ilbc.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia-codec/ilbc.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/ilbc.c index c46e2f40322f1bc84e5c6ca98a8c7a712db2574d..ff004aa734d99f973bb6a86538d85caf912b14c3 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/ilbc.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/ilbc.c @@ -1,6 +1,7 @@ -/* $Id: ilbc.c 2236 2008-08-25 13:58:25Z nanang $ */ +/* $Id: ilbc.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/ipp_codecs.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/ipp_codecs.c new file mode 100644 index 0000000000000000000000000000000000000000..a897158aeaedcd81541b9c2d8c2b3051357b67b0 --- /dev/null +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/ipp_codecs.c @@ -0,0 +1,1420 @@ +/* $Id: ipp_codecs.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +/* + * Only build this file if PJMEDIA_HAS_INTEL_IPP != 0 + */ +#if defined(PJMEDIA_HAS_INTEL_IPP) && PJMEDIA_HAS_INTEL_IPP != 0 + +#include + +#define THIS_FILE "ipp_codecs.c" + +/* Prototypes for IPP codecs factory */ +static pj_status_t ipp_test_alloc( pjmedia_codec_factory *factory, + const pjmedia_codec_info *id ); +static pj_status_t ipp_default_attr( pjmedia_codec_factory *factory, + const pjmedia_codec_info *id, + pjmedia_codec_param *attr ); +static pj_status_t ipp_enum_codecs( pjmedia_codec_factory *factory, + unsigned *count, + pjmedia_codec_info codecs[]); +static pj_status_t ipp_alloc_codec( pjmedia_codec_factory *factory, + const pjmedia_codec_info *id, + pjmedia_codec **p_codec); +static pj_status_t ipp_dealloc_codec( pjmedia_codec_factory *factory, + pjmedia_codec *codec ); + +/* Prototypes for IPP codecs implementation. */ +static pj_status_t ipp_codec_init( pjmedia_codec *codec, + pj_pool_t *pool ); +static pj_status_t ipp_codec_open( pjmedia_codec *codec, + pjmedia_codec_param *attr ); +static pj_status_t ipp_codec_close( pjmedia_codec *codec ); +static pj_status_t ipp_codec_modify(pjmedia_codec *codec, + const pjmedia_codec_param *attr ); +static pj_status_t ipp_codec_parse( pjmedia_codec *codec, + void *pkt, + pj_size_t pkt_size, + const pj_timestamp *ts, + unsigned *frame_cnt, + pjmedia_frame frames[]); +static pj_status_t ipp_codec_encode( pjmedia_codec *codec, + const struct pjmedia_frame *input, + unsigned output_buf_len, + struct pjmedia_frame *output); +static pj_status_t ipp_codec_decode( pjmedia_codec *codec, + const struct pjmedia_frame *input, + unsigned output_buf_len, + struct pjmedia_frame *output); +static pj_status_t ipp_codec_recover(pjmedia_codec *codec, + unsigned output_buf_len, + struct pjmedia_frame *output); + +/* Definition for IPP codecs operations. */ +static pjmedia_codec_op ipp_op = +{ + &ipp_codec_init, + &ipp_codec_open, + &ipp_codec_close, + &ipp_codec_modify, + &ipp_codec_parse, + &ipp_codec_encode, + &ipp_codec_decode, + &ipp_codec_recover +}; + +/* Definition for IPP codecs factory operations. */ +static pjmedia_codec_factory_op ipp_factory_op = +{ + &ipp_test_alloc, + &ipp_default_attr, + &ipp_enum_codecs, + &ipp_alloc_codec, + &ipp_dealloc_codec +}; + +/* IPP codecs factory */ +static struct ipp_factory { + pjmedia_codec_factory base; + pjmedia_endpt *endpt; + pj_pool_t *pool; + pj_mutex_t *mutex; +} ipp_factory; + +/* IPP codecs private data. */ +typedef struct ipp_private { + int codec_idx; /**< Codec index. */ + void *codec_setting; /**< Specific codec setting. */ + pj_pool_t *pool; /**< Pool for each instance. */ + + USC_Handle enc; /**< Encoder state. */ + USC_Handle dec; /**< Decoder state. */ + USC_CodecInfo *info; /**< Native codec info. */ + pj_uint16_t frame_size; /**< Bitstream frame size. */ + + pj_bool_t plc_enabled; /**< PLC enabled flag. */ + pjmedia_plc *plc; /**< PJMEDIA PLC engine, NULL if + codec has internal PLC. */ + + pj_bool_t vad_enabled; /**< VAD enabled flag. */ + pjmedia_silence_det *vad; /**< PJMEDIA VAD engine, NULL if + codec has internal VAD. */ + pj_timestamp last_tx; /**< Timestamp of last transmit.*/ +} ipp_private_t; + + +/* USC codec implementations. */ +extern USC_Fxns USC_G729AFP_Fxns; +extern USC_Fxns USC_G729I_Fxns; +extern USC_Fxns USC_G723_Fxns; +extern USC_Fxns USC_G726_Fxns; +extern USC_Fxns USC_G728_Fxns; +extern USC_Fxns USC_G722_Fxns; +extern USC_Fxns USC_GSMAMR_Fxns; +extern USC_Fxns USC_AMRWB_Fxns; +extern USC_Fxns USC_AMRWBE_Fxns; + + +/* CUSTOM CALLBACKS */ + +/* This callback is useful for translating RTP frame into USC frame, e.g: + * reassigning frame attributes, reorder bitstream. Default behaviour of + * the translation is just setting the USC frame buffer & its size as + * specified in RTP frame, setting USC frame frametype to 0, setting bitrate + * of USC frame to bitrate info of codec_data. Implement this callback when + * the default behaviour is unapplicable. + */ +typedef void (*predecode_cb)(ipp_private_t *codec_data, + const pjmedia_frame *rtp_frame, + USC_Bitstream *usc_frame); + +/* Parse frames from a packet. Default behaviour of frame parsing is + * just separating frames based on calculating frame length derived + * from bitrate. Implement this callback when the default behaviour is + * unapplicable. + */ +typedef pj_status_t (*parse_cb)(ipp_private_t *codec_data, void *pkt, + pj_size_t pkt_size, const pj_timestamp *ts, + unsigned *frame_cnt, pjmedia_frame frames[]); + +/* Pack frames into a packet. Default behaviour of packing frames is + * just stacking the frames with octet aligned without adding any + * payload header. Implement this callback when the default behaviour is + * unapplicable. + */ +typedef pj_status_t (*pack_cb)(ipp_private_t *codec_data, void *pkt, + pj_size_t *pkt_size, pj_size_t max_pkt_size); + + + +/* Custom callback implementations. */ +static void predecode_g723( ipp_private_t *codec_data, + const pjmedia_frame *rtp_frame, + USC_Bitstream *usc_frame); +static pj_status_t parse_g723( ipp_private_t *codec_data, void *pkt, + pj_size_t pkt_size, const pj_timestamp *ts, + unsigned *frame_cnt, pjmedia_frame frames[]); + +static void predecode_g729( ipp_private_t *codec_data, + const pjmedia_frame *rtp_frame, + USC_Bitstream *usc_frame); + +static void predecode_amr( ipp_private_t *codec_data, + const pjmedia_frame *rtp_frame, + USC_Bitstream *usc_frame); +static pj_status_t parse_amr( ipp_private_t *codec_data, void *pkt, + pj_size_t pkt_size, const pj_timestamp *ts, + unsigned *frame_cnt, pjmedia_frame frames[]); +static pj_status_t pack_amr( ipp_private_t *codec_data, void *pkt, + pj_size_t *pkt_size, pj_size_t max_pkt_size); + + +/* IPP codec implementation descriptions. */ +static struct ipp_codec { + int enabled; /* Is this codec enabled? */ + const char *name; /* Codec name. */ + pj_uint8_t pt; /* Payload type. */ + USC_Fxns *fxns; /* USC callback functions. */ + unsigned clock_rate; /* Codec's clock rate. */ + unsigned channel_count; /* Codec's channel count. */ + unsigned samples_per_frame; /* Codec's samples count. */ + + unsigned def_bitrate; /* Default bitrate of this codec. */ + unsigned max_bitrate; /* Maximum bitrate of this codec. */ + pj_uint8_t frm_per_pkt; /* Default num of frames per packet.*/ + int has_native_vad; /* Codec has internal VAD? */ + int has_native_plc; /* Codec has internal PLC? */ + + predecode_cb predecode; /* Callback to translate RTP frame + into USC frame. */ + parse_cb parse; /* Callback to parse bitstream. */ + pack_cb pack; /* Callback to pack bitstream. */ + + pjmedia_codec_fmtp dec_fmtp; /* Decoder's fmtp params. */ +} + +ipp_codec[] = +{ +# if PJMEDIA_HAS_INTEL_IPP_CODEC_AMR + {1, "AMR", PJMEDIA_RTP_PT_AMR, &USC_GSMAMR_Fxns, 8000, 1, 160, + 5900, 12200, 4, 1, 1, + &predecode_amr, &parse_amr, &pack_amr + /*, {1, {{{"octet-align", 11}, {"1", 1}}} } */ + }, +# endif + +# if PJMEDIA_HAS_INTEL_IPP_CODEC_AMRWB + {1, "AMR-WB", PJMEDIA_RTP_PT_AMRWB, &USC_AMRWB_Fxns, 16000, 1, 320, + 15850, 23850, 1, 1, 1, + &predecode_amr, &parse_amr, &pack_amr + }, +# endif + +# if PJMEDIA_HAS_INTEL_IPP_CODEC_G729 +# if defined(PJ_HAS_FLOATING_POINT) && (PJ_HAS_FLOATING_POINT != 0) + {1, "G729", PJMEDIA_RTP_PT_G729, &USC_G729AFP_Fxns, 8000, 1, 80, + 8000, 11800, 2, 1, 1, + &predecode_g729, NULL, NULL + }, +# else + {1, "G729", PJMEDIA_RTP_PT_G729, &USC_G729I_Fxns, 8000, 1, 80, + 8000, 11800, 2, 1, 1, + &predecode_g729, NULL, NULL + }, +# endif +# endif + +# if PJMEDIA_HAS_INTEL_IPP_CODEC_G723_1 + /* This is actually G.723.1 */ + {1, "G723", PJMEDIA_RTP_PT_G723, &USC_G723_Fxns, 8000, 1, 240, + 6300, 6300, 1, 1, 1, + &predecode_g723, &parse_g723, NULL + }, +# endif + +# if PJMEDIA_HAS_INTEL_IPP_CODEC_G726 + {0, "G726-16", PJMEDIA_RTP_PT_G726_16, &USC_G726_Fxns, 8000, 1, 80, + 16000, 16000, 2, 0, 0, + NULL, NULL, NULL + }, + {0, "G726-24", PJMEDIA_RTP_PT_G726_24, &USC_G726_Fxns, 8000, 1, 80, + 24000, 24000, 2, 0, 0, + NULL, NULL, NULL + }, + {1, "G726-32", PJMEDIA_RTP_PT_G726_32, &USC_G726_Fxns, 8000, 1, 80, + 32000, 32000, 2, 0, 0, + NULL, NULL, NULL + }, + {0, "G726-40", PJMEDIA_RTP_PT_G726_40, &USC_G726_Fxns, 8000, 1, 80, + 40000, 40000, 2, 0, 0, + NULL, NULL, NULL + }, +# endif + +# if PJMEDIA_HAS_INTEL_IPP_CODEC_G728 + {1, "G728", PJMEDIA_RTP_PT_G728, &USC_G728_Fxns, 8000, 1, 80, + 16000, 16000, 2, 0, 1, + NULL, NULL, NULL + }, +# endif + +# if PJMEDIA_HAS_INTEL_IPP_CODEC_G722_1 + {0, "G7221", PJMEDIA_RTP_PT_G722_1_16, &USC_G722_Fxns, 16000, 1, 320, + 16000, 16000, 1, 0, 1, + NULL, NULL, NULL, + {1, {{{"bitrate", 7}, {"16000", 5}}} } + }, + {1, "G7221", PJMEDIA_RTP_PT_G722_1_24, &USC_G722_Fxns, 16000, 1, 320, + 24000, 24000, 1, 0, 1, + NULL, NULL, NULL, + {1, {{{"bitrate", 7}, {"24000", 5}}} } + }, + {1, "G7221", PJMEDIA_RTP_PT_G722_1_32, &USC_G722_Fxns, 16000, 1, 320, + 32000, 32000, 1, 0, 1, + NULL, NULL, NULL, + {1, {{{"bitrate", 7}, {"32000", 5}}} } + }, +# endif +}; + + +#if PJMEDIA_HAS_INTEL_IPP_CODEC_G729 + +static void predecode_g729( ipp_private_t *codec_data, + const pjmedia_frame *rtp_frame, + USC_Bitstream *usc_frame) +{ + switch (rtp_frame->size) { + case 2: + /* SID */ + usc_frame->frametype = 1; + usc_frame->bitrate = codec_data->info->params.modes.bitrate; + break; + case 8: + /* G729D */ + usc_frame->frametype = 2; + usc_frame->bitrate = 6400; + break; + case 10: + /* G729 */ + usc_frame->frametype = 3; + usc_frame->bitrate = 8000; + break; + case 15: + /* G729E */ + usc_frame->frametype = 4; + usc_frame->bitrate = 11800; + break; + default: + usc_frame->frametype = 0; + usc_frame->bitrate = 0; + break; + } + + usc_frame->pBuffer = rtp_frame->buf; + usc_frame->nbytes = rtp_frame->size; +} + +#endif /* PJMEDIA_HAS_INTEL_IPP_CODEC_G729 */ + + +#if PJMEDIA_HAS_INTEL_IPP_CODEC_G723_1 + +static void predecode_g723( ipp_private_t *codec_data, + const pjmedia_frame *rtp_frame, + USC_Bitstream *usc_frame) +{ + int i, HDR = 0; + pj_uint8_t *f = (pj_uint8_t*)rtp_frame->buf; + + PJ_UNUSED_ARG(codec_data); + + for (i = 0; i < 2; ++i){ + int tmp; + tmp = (f[0] >> (i & 0x7)) & 1; + HDR += tmp << i ; + } + + usc_frame->pBuffer = rtp_frame->buf; + usc_frame->nbytes = rtp_frame->size; + usc_frame->bitrate = HDR == 0? 6300 : 5300; + usc_frame->frametype = 0; +} + +static pj_status_t parse_g723(ipp_private_t *codec_data, void *pkt, + pj_size_t pkt_size, const pj_timestamp *ts, + unsigned *frame_cnt, pjmedia_frame frames[]) +{ + unsigned count = 0; + pj_uint8_t *f = (pj_uint8_t*)pkt; + + while (pkt_size && count < *frame_cnt) { + int framesize, i, j; + int HDR = 0; + + for (i = 0; i < 2; ++i){ + j = (f[0] >> (i & 0x7)) & 1; + HDR += j << i ; + } + + if (HDR == 0) + framesize = 24; + else if (HDR == 1) + framesize = 20; + else if (HDR == 2) + framesize = 4; + else if (HDR == 3) + framesize = 1; + else { + pj_assert(!"Unknown G723.1 frametype, packet may be corrupted!"); + return PJMEDIA_CODEC_EINMODE; + } + + frames[count].type = PJMEDIA_FRAME_TYPE_AUDIO; + frames[count].buf = f; + frames[count].size = framesize; + frames[count].timestamp.u64 = ts->u64 + count * + ipp_codec[codec_data->codec_idx].samples_per_frame; + + f += framesize; + pkt_size -= framesize; + + ++count; + } + + *frame_cnt = count; + return PJ_SUCCESS; +} + +#endif /* PJMEDIA_HAS_INTEL_IPP_CODEC_G723_1 */ + + +#if PJMEDIA_HAS_INTEL_IPP_CODEC_AMR + +#include + +typedef struct amr_settings_t { + pjmedia_codec_amr_pack_setting enc_setting; + pjmedia_codec_amr_pack_setting dec_setting; + pj_int8_t enc_mode; +} amr_settings_t; + + +/* Rearrange AMR bitstream and convert RTP frame into USC frame: + * - make the start_bit to be 0 + * - if it is speech frame, reorder bitstream from sensitivity bits order + * to encoder bits order. + * - set the appropriate value of usc_frame. + */ +static void predecode_amr( ipp_private_t *codec_data, + const pjmedia_frame *rtp_frame, + USC_Bitstream *usc_frame) +{ + pjmedia_frame frame; + pjmedia_codec_amr_bit_info *info; + pjmedia_codec_amr_pack_setting *setting; + + setting = &((amr_settings_t*)codec_data->codec_setting)->dec_setting; + + frame = *rtp_frame; + pjmedia_codec_amr_predecode(rtp_frame, setting, &frame); + info = (pjmedia_codec_amr_bit_info*) &frame.bit_info; + + usc_frame->pBuffer = frame.buf; + usc_frame->nbytes = frame.size; + if (info->mode != -1) { + usc_frame->bitrate = setting->amr_nb? + pjmedia_codec_amrnb_bitrates[info->mode]: + pjmedia_codec_amrwb_bitrates[info->mode]; + } else { + usc_frame->bitrate = 0; + } + + if (frame.size > 5) { + /* Speech */ + if (info->good_quality) + usc_frame->frametype = 0; + else + usc_frame->frametype = setting->amr_nb ? 5 : 6; + } else if (frame.size == 5) { + /* SID */ + if (info->good_quality) { + pj_bool_t STI; + STI = (((pj_uint8_t*)frame.buf)[35 >> 3] & 0x10) != 0; + usc_frame->frametype = STI? 2 : 1; + } else { + usc_frame->frametype = setting->amr_nb ? 6 : 7; + } + } else { + /* no data */ + usc_frame->frametype = 3; + } +} + +/* Pack AMR payload */ +static pj_status_t pack_amr(ipp_private_t *codec_data, void *pkt, + pj_size_t *pkt_size, pj_size_t max_pkt_size) +{ + enum {MAX_FRAMES_PER_PACKET = 16}; + + pjmedia_frame frames[MAX_FRAMES_PER_PACKET]; + unsigned nframes = 0; + pjmedia_codec_amr_bit_info *info; + pj_uint8_t *r; /* Read cursor */ + pj_uint8_t SID_FT; + pjmedia_codec_amr_pack_setting *setting; + + setting = &((amr_settings_t*)codec_data->codec_setting)->enc_setting; + + SID_FT = (pj_uint8_t)(setting->amr_nb? 8 : 9); + + /* Align pkt buf right */ + r = (pj_uint8_t*)pkt + max_pkt_size - *pkt_size; + pj_memmove(r, pkt, *pkt_size); + + /* Get frames */ + for (;;) { + pj_bool_t eof; + pj_uint16_t info_; + + info_ = *((pj_uint16_t*)r); + eof = ((info_ & 0x40) != 0); + + info = (pjmedia_codec_amr_bit_info*) &frames[nframes].bit_info; + pj_bzero(info, sizeof(*info)); + info->frame_type = (pj_uint8_t)(info_ & 0x0F); + info->good_quality = (pj_uint8_t)((info_ & 0x80) == 0); + info->mode = (pj_int8_t) ((info_ >> 8) & 0x0F); + + frames[nframes].buf = r + 2; + frames[nframes].size = info->frame_type <= SID_FT ? + pjmedia_codec_amrnb_framelen[info->frame_type] : + 0; + + r += frames[nframes].size + 2; + + /* Last frame */ + if (++nframes >= MAX_FRAMES_PER_PACKET || eof) + break; + } + + /* Pack */ + *pkt_size = max_pkt_size; + return pjmedia_codec_amr_pack(frames, nframes, setting, pkt, pkt_size); +} + + +/* Parse AMR payload into frames. */ +static pj_status_t parse_amr(ipp_private_t *codec_data, void *pkt, + pj_size_t pkt_size, const pj_timestamp *ts, + unsigned *frame_cnt, pjmedia_frame frames[]) +{ + amr_settings_t* s = (amr_settings_t*)codec_data->codec_setting; + pjmedia_codec_amr_pack_setting *setting; + pj_status_t status; + pj_uint8_t cmr; + + setting = &s->dec_setting; + + status = pjmedia_codec_amr_parse(pkt, pkt_size, ts, setting, frames, + frame_cnt, &cmr); + if (status != PJ_SUCCESS) + return status; + + /* Check Change Mode Request. */ + if ((setting->amr_nb && cmr <= 7) || (!setting->amr_nb && cmr <= 8)) { + s->enc_mode = cmr; + } + + return PJ_SUCCESS; +} + +#endif /* PJMEDIA_HAS_INTEL_IPP_CODEC_AMR */ + + +/* + * Initialize and register IPP codec factory to pjmedia endpoint. + */ +PJ_DEF(pj_status_t) pjmedia_codec_ipp_init( pjmedia_endpt *endpt ) +{ + pjmedia_codec_mgr *codec_mgr; + pj_status_t status; + + if (ipp_factory.pool != NULL) { + /* Already initialized. */ + return PJ_SUCCESS; + } + + /* Create IPP codec factory. */ + ipp_factory.base.op = &ipp_factory_op; + ipp_factory.base.factory_data = NULL; + ipp_factory.endpt = endpt; + + ipp_factory.pool = pjmedia_endpt_create_pool(endpt, "IPP codecs", 4000, 4000); + if (!ipp_factory.pool) + return PJ_ENOMEM; + + /* Create mutex. */ + status = pj_mutex_create_simple(ipp_factory.pool, "IPP codecs", + &ipp_factory.mutex); + if (status != PJ_SUCCESS) + goto on_error; + + /* Get the codec manager. */ + codec_mgr = pjmedia_endpt_get_codec_mgr(endpt); + if (!codec_mgr) { + status = PJ_EINVALIDOP; + goto on_error; + } + + /* Register codec factory to endpoint. */ + status = pjmedia_codec_mgr_register_factory(codec_mgr, + &ipp_factory.base); + if (status != PJ_SUCCESS) + goto on_error; + + /* Done. */ + return PJ_SUCCESS; + +on_error: + pj_pool_release(ipp_factory.pool); + ipp_factory.pool = NULL; + return status; +} + +/* + * Unregister IPP codecs factory from pjmedia endpoint. + */ +PJ_DEF(pj_status_t) pjmedia_codec_ipp_deinit(void) +{ + pjmedia_codec_mgr *codec_mgr; + pj_status_t status; + + if (ipp_factory.pool == NULL) { + /* Already deinitialized */ + return PJ_SUCCESS; + } + + pj_mutex_lock(ipp_factory.mutex); + + /* Get the codec manager. */ + codec_mgr = pjmedia_endpt_get_codec_mgr(ipp_factory.endpt); + if (!codec_mgr) { + pj_pool_release(ipp_factory.pool); + ipp_factory.pool = NULL; + return PJ_EINVALIDOP; + } + + /* Unregister IPP codecs factory. */ + status = pjmedia_codec_mgr_unregister_factory(codec_mgr, + &ipp_factory.base); + + /* Destroy mutex. */ + pj_mutex_destroy(ipp_factory.mutex); + + /* Destroy pool. */ + pj_pool_release(ipp_factory.pool); + ipp_factory.pool = NULL; + + return status; +} + +/* + * Check if factory can allocate the specified codec. + */ +static pj_status_t ipp_test_alloc( pjmedia_codec_factory *factory, + const pjmedia_codec_info *info ) +{ + unsigned i; + + PJ_UNUSED_ARG(factory); + + /* Type MUST be audio. */ + if (info->type != PJMEDIA_TYPE_AUDIO) + return PJMEDIA_CODEC_EUNSUP; + + for (i = 0; i < PJ_ARRAY_SIZE(ipp_codec); ++i) { + pj_str_t name = pj_str((char*)ipp_codec[i].name); + if ((pj_stricmp(&info->encoding_name, &name) == 0) && + (info->clock_rate == (unsigned)ipp_codec[i].clock_rate) && + (info->channel_cnt == (unsigned)ipp_codec[i].channel_count) && + (ipp_codec[i].enabled)) + { + return PJ_SUCCESS; + } + } + + /* Unsupported, or mode is disabled. */ + return PJMEDIA_CODEC_EUNSUP; +} + +/* + * Generate default attribute. + */ +static pj_status_t ipp_default_attr (pjmedia_codec_factory *factory, + const pjmedia_codec_info *id, + pjmedia_codec_param *attr ) +{ + unsigned i; + + PJ_ASSERT_RETURN(factory==&ipp_factory.base, PJ_EINVAL); + + pj_bzero(attr, sizeof(pjmedia_codec_param)); + + for (i = 0; i < PJ_ARRAY_SIZE(ipp_codec); ++i) { + pj_str_t name = pj_str((char*)ipp_codec[i].name); + if ((pj_stricmp(&id->encoding_name, &name) == 0) && + (id->clock_rate == (unsigned)ipp_codec[i].clock_rate) && + (id->channel_cnt == (unsigned)ipp_codec[i].channel_count) && + (id->pt == (unsigned)ipp_codec[i].pt)) + { + attr->info.pt = (pj_uint8_t)id->pt; + attr->info.channel_cnt = ipp_codec[i].channel_count; + attr->info.clock_rate = ipp_codec[i].clock_rate; + attr->info.avg_bps = ipp_codec[i].def_bitrate; + attr->info.max_bps = ipp_codec[i].max_bitrate; + attr->info.pcm_bits_per_sample = 16; + attr->info.frm_ptime = (pj_uint16_t) + (ipp_codec[i].samples_per_frame * 1000 / + ipp_codec[i].channel_count / + ipp_codec[i].clock_rate); + attr->setting.frm_per_pkt = ipp_codec[i].frm_per_pkt; + + /* Default flags. */ + attr->setting.plc = 1; + attr->setting.penh= 0; + attr->setting.vad = 1; + attr->setting.cng = attr->setting.vad; + attr->setting.dec_fmtp = ipp_codec[i].dec_fmtp; + + if (attr->setting.vad == 0) { +#if PJMEDIA_HAS_INTEL_IPP_CODEC_G729 + if (id->pt == PJMEDIA_RTP_PT_G729) { + /* Signal G729 Annex B is being disabled */ + attr->setting.dec_fmtp.cnt = 1; + pj_strset2(&attr->setting.dec_fmtp.param[0].name, "annexb"); + pj_strset2(&attr->setting.dec_fmtp.param[0].val, "no"); + } +#endif + } + + return PJ_SUCCESS; + } + } + + return PJMEDIA_CODEC_EUNSUP; +} + +/* + * Enum codecs supported by this factory. + */ +static pj_status_t ipp_enum_codecs(pjmedia_codec_factory *factory, + unsigned *count, + pjmedia_codec_info codecs[]) +{ + unsigned max; + unsigned i; + + PJ_UNUSED_ARG(factory); + PJ_ASSERT_RETURN(codecs && *count > 0, PJ_EINVAL); + + max = *count; + + for (i = 0, *count = 0; i < PJ_ARRAY_SIZE(ipp_codec) && *count < max; ++i) + { + if (!ipp_codec[i].enabled) + continue; + + pj_bzero(&codecs[*count], sizeof(pjmedia_codec_info)); + codecs[*count].encoding_name = pj_str((char*)ipp_codec[i].name); + codecs[*count].pt = ipp_codec[i].pt; + codecs[*count].type = PJMEDIA_TYPE_AUDIO; + codecs[*count].clock_rate = ipp_codec[i].clock_rate; + codecs[*count].channel_cnt = ipp_codec[i].channel_count; + + ++*count; + } + + return PJ_SUCCESS; +} + +/* + * Allocate a new codec instance. + */ +static pj_status_t ipp_alloc_codec( pjmedia_codec_factory *factory, + const pjmedia_codec_info *id, + pjmedia_codec **p_codec) +{ + ipp_private_t *codec_data; + pjmedia_codec *codec; + int idx; + pj_pool_t *pool; + unsigned i; + + PJ_ASSERT_RETURN(factory && id && p_codec, PJ_EINVAL); + PJ_ASSERT_RETURN(factory == &ipp_factory.base, PJ_EINVAL); + + pj_mutex_lock(ipp_factory.mutex); + + /* Find codec's index */ + idx = -1; + for (i = 0; i < PJ_ARRAY_SIZE(ipp_codec); ++i) { + pj_str_t name = pj_str((char*)ipp_codec[i].name); + if ((pj_stricmp(&id->encoding_name, &name) == 0) && + (id->clock_rate == (unsigned)ipp_codec[i].clock_rate) && + (id->channel_cnt == (unsigned)ipp_codec[i].channel_count) && + (ipp_codec[i].enabled)) + { + idx = i; + break; + } + } + if (idx == -1) { + *p_codec = NULL; + return PJMEDIA_CODEC_EFAILED; + } + + /* Create pool for codec instance */ + pool = pjmedia_endpt_create_pool(ipp_factory.endpt, "IPPcodec", 512, 512); + codec = PJ_POOL_ZALLOC_T(pool, pjmedia_codec); + PJ_ASSERT_RETURN(codec != NULL, PJ_ENOMEM); + codec->op = &ipp_op; + codec->factory = factory; + codec->codec_data = PJ_POOL_ZALLOC_T(pool, ipp_private_t); + codec_data = (ipp_private_t*) codec->codec_data; + + /* Create PLC if codec has no internal PLC */ + if (!ipp_codec[idx].has_native_plc) { + pj_status_t status; + status = pjmedia_plc_create(pool, ipp_codec[idx].clock_rate, + ipp_codec[idx].samples_per_frame, 0, + &codec_data->plc); + if (status != PJ_SUCCESS) { + pj_pool_release(pool); + pj_mutex_unlock(ipp_factory.mutex); + return status; + } + } + + /* Create silence detector if codec has no internal VAD */ + if (!ipp_codec[idx].has_native_vad) { + pj_status_t status; + status = pjmedia_silence_det_create(pool, + ipp_codec[idx].clock_rate, + ipp_codec[idx].samples_per_frame, + &codec_data->vad); + if (status != PJ_SUCCESS) { + pj_pool_release(pool); + pj_mutex_unlock(ipp_factory.mutex); + return status; + } + } + + codec_data->pool = pool; + codec_data->codec_idx = idx; + + pj_mutex_unlock(ipp_factory.mutex); + + *p_codec = codec; + return PJ_SUCCESS; +} + +/* + * Free codec. + */ +static pj_status_t ipp_dealloc_codec( pjmedia_codec_factory *factory, + pjmedia_codec *codec ) +{ + ipp_private_t *codec_data; + + PJ_ASSERT_RETURN(factory && codec, PJ_EINVAL); + PJ_ASSERT_RETURN(factory == &ipp_factory.base, PJ_EINVAL); + + /* Close codec, if it's not closed. */ + codec_data = (ipp_private_t*) codec->codec_data; + if (codec_data->enc != NULL || codec_data->dec != NULL) { + ipp_codec_close(codec); + } + + pj_pool_release(codec_data->pool); + + return PJ_SUCCESS; +} + +/* + * Init codec. + */ +static pj_status_t ipp_codec_init( pjmedia_codec *codec, + pj_pool_t *pool ) +{ + PJ_UNUSED_ARG(codec); + PJ_UNUSED_ARG(pool); + return PJ_SUCCESS; +} + +/* + * Open codec. + */ +static pj_status_t ipp_codec_open( pjmedia_codec *codec, + pjmedia_codec_param *attr ) +{ + ipp_private_t *codec_data = (ipp_private_t*) codec->codec_data; + struct ipp_codec *ippc = &ipp_codec[codec_data->codec_idx]; + int info_size; + pj_pool_t *pool; + int i, j; + USC_MemBank *membanks; + int nb_membanks; + + pool = codec_data->pool; + + /* Get the codec info size */ + if (USC_NoError != ippc->fxns->std.GetInfoSize(&info_size)) { + PJ_LOG(1,(THIS_FILE, "Error getting codec info size")); + goto on_error; + } + /* Get the codec info */ + codec_data->info = pj_pool_zalloc(pool, info_size); + if (USC_NoError != ippc->fxns->std.GetInfo((USC_Handle)NULL, + codec_data->info)) + { + PJ_LOG(1,(THIS_FILE, "Error getting codec info")); + goto on_error; + } + + /* PREPARING THE ENCODER */ + + /* Setting the encoder params */ + codec_data->info->params.direction = USC_ENCODE; + codec_data->info->params.modes.vad = attr->setting.vad && + ippc->has_native_vad; + codec_data->info->params.modes.bitrate = attr->info.avg_bps; + codec_data->info->params.law = 0; /* Linear PCM input */ + +#if PJMEDIA_HAS_INTEL_IPP_CODEC_G729 + if (ippc->pt == PJMEDIA_RTP_PT_G729) { + /* Check if G729 Annex B is signaled to be disabled */ + for (i = 0; i < attr->setting.enc_fmtp.cnt; ++i) { + if (pj_stricmp2(&attr->setting.enc_fmtp.param[i].name, "annexb")==0) + { + if (pj_stricmp2(&attr->setting.enc_fmtp.param[i].val, "no")==0) + codec_data->info->params.modes.vad = 0; + break; + } + } + } +#endif + + /* Get number of memory blocks needed by the encoder */ + if (USC_NoError != ippc->fxns->std.NumAlloc(&codec_data->info->params, + &nb_membanks)) + { + PJ_LOG(1,(THIS_FILE, "Error getting no of memory blocks of encoder")); + goto on_error; + } + + /* Allocate memory blocks table */ + membanks = (USC_MemBank*) pj_pool_zalloc(pool, + sizeof(USC_MemBank) * nb_membanks); + /* Get size of each memory block */ + if (USC_NoError != ippc->fxns->std.MemAlloc(&codec_data->info->params, + membanks)) + { + PJ_LOG(1,(THIS_FILE, "Error getting memory blocks size of encoder")); + goto on_error; + } + + /* Allocate memory for each block */ + for (i = 0; i < nb_membanks; i++) { + membanks[i].pMem = (char*) pj_pool_zalloc(pool, membanks[i].nbytes); + } + + /* Create encoder instance */ + if (USC_NoError != ippc->fxns->std.Init(&codec_data->info->params, + membanks, + &codec_data->enc)) + { + PJ_LOG(1,(THIS_FILE, "Error initializing encoder")); + goto on_error; + } + + /* PREPARING THE DECODER */ + + /* Setting the decoder params */ + codec_data->info->params.direction = USC_DECODE; + + /* Not sure if VAD affects decoder, just try to be safe */ + codec_data->info->params.modes.vad = ippc->has_native_vad; + + /* Get number of memory blocks needed by the decoder */ + if (USC_NoError != ippc->fxns->std.NumAlloc(&codec_data->info->params, + &nb_membanks)) + { + PJ_LOG(1,(THIS_FILE, "Error getting no of memory blocks of decoder")); + goto on_error; + } + + /* Allocate memory blocks table */ + membanks = (USC_MemBank*) pj_pool_zalloc(pool, + sizeof(USC_MemBank) * nb_membanks); + /* Get size of each memory block */ + if (USC_NoError != ippc->fxns->std.MemAlloc(&codec_data->info->params, + membanks)) + { + PJ_LOG(1,(THIS_FILE, "Error getting memory blocks size of decoder")); + goto on_error; + } + + /* Allocate memory for each block */ + for (i = 0; i < nb_membanks; i++) { + membanks[i].pMem = (char*) pj_pool_zalloc(pool, membanks[i].nbytes); + } + + /* Create decoder instance */ + if (USC_NoError != ippc->fxns->std.Init(&codec_data->info->params, + membanks, &codec_data->dec)) + { + PJ_LOG(1,(THIS_FILE, "Error initializing decoder")); + goto on_error; + } + + /* Update codec info */ + ippc->fxns->std.GetInfo((USC_Handle)codec_data->enc, codec_data->info); + + /* Get bitstream size */ + i = codec_data->info->params.modes.bitrate * ippc->samples_per_frame; + j = ippc->clock_rate << 3; + codec_data->frame_size = (pj_uint16_t)(i / j); + if (i % j) ++codec_data->frame_size; + + codec_data->vad_enabled = (attr->setting.vad != 0); + codec_data->plc_enabled = (attr->setting.plc != 0); + +#if PJMEDIA_HAS_INTEL_IPP_CODEC_AMR + /* Init AMR settings */ + if (ippc->pt == PJMEDIA_RTP_PT_AMR || ippc->pt == PJMEDIA_RTP_PT_AMRWB) { + amr_settings_t *s; + pj_uint8_t octet_align = 0; + const pj_str_t STR_FMTP_OCTET_ALIGN = {"octet-align", 11}; + + /* Check octet-align */ + for (i = 0; i < attr->setting.dec_fmtp.cnt; ++i) { + if (pj_stricmp(&attr->setting.dec_fmtp.param[i].name, + &STR_FMTP_OCTET_ALIGN) == 0) + { + octet_align=(pj_uint8_t) + (pj_strtoul(&attr->setting.dec_fmtp.param[i].val)); + break; + } + } + + s = PJ_POOL_ZALLOC_T(pool, amr_settings_t); + codec_data->codec_setting = s; + + s->enc_mode = pjmedia_codec_amr_get_mode(ippc->def_bitrate); + if (s->enc_mode < 0) + goto on_error; + + s->enc_setting.amr_nb = ippc->pt == PJMEDIA_RTP_PT_AMR; + s->enc_setting.octet_aligned = octet_align; + s->enc_setting.reorder = PJ_TRUE; + s->enc_setting.cmr = 15; + + s->dec_setting.amr_nb = ippc->pt == PJMEDIA_RTP_PT_AMR; + s->dec_setting.octet_aligned = octet_align; + s->dec_setting.reorder = PJ_TRUE; + } +#endif + + return PJ_SUCCESS; + +on_error: + return PJMEDIA_CODEC_EFAILED; +} + +/* + * Close codec. + */ +static pj_status_t ipp_codec_close( pjmedia_codec *codec ) +{ + PJ_UNUSED_ARG(codec); + + return PJ_SUCCESS; +} + + +/* + * Modify codec settings. + */ +static pj_status_t ipp_codec_modify(pjmedia_codec *codec, + const pjmedia_codec_param *attr ) +{ + ipp_private_t *codec_data = (ipp_private_t*) codec->codec_data; + struct ipp_codec *ippc = &ipp_codec[codec_data->codec_idx]; + + codec_data->vad_enabled = (attr->setting.vad != 0); + codec_data->plc_enabled = (attr->setting.plc != 0); + + if (ippc->has_native_vad) { + USC_Modes modes; + + modes = codec_data->info->params.modes; + modes.vad = codec_data->vad_enabled; + ippc->fxns->std.Control(&modes, codec_data->enc); + } + + return PJ_SUCCESS; +} + +/* + * Get frames in the packet. + */ +static pj_status_t ipp_codec_parse( pjmedia_codec *codec, + void *pkt, + pj_size_t pkt_size, + const pj_timestamp *ts, + unsigned *frame_cnt, + pjmedia_frame frames[]) +{ + ipp_private_t *codec_data = (ipp_private_t*) codec->codec_data; + struct ipp_codec *ippc = &ipp_codec[codec_data->codec_idx]; + unsigned count = 0; + + PJ_ASSERT_RETURN(frame_cnt, PJ_EINVAL); + + if (ippc->parse != NULL) { + return ippc->parse(codec_data, pkt, pkt_size, ts, frame_cnt, frames); + } + + while (pkt_size >= codec_data->frame_size && count < *frame_cnt) { + frames[count].type = PJMEDIA_FRAME_TYPE_AUDIO; + frames[count].buf = pkt; + frames[count].size = codec_data->frame_size; + frames[count].timestamp.u64 = ts->u64 + count*ippc->samples_per_frame; + + pkt = ((char*)pkt) + codec_data->frame_size; + pkt_size -= codec_data->frame_size; + + ++count; + } + + if (pkt_size && count < *frame_cnt) { + frames[count].type = PJMEDIA_FRAME_TYPE_AUDIO; + frames[count].buf = pkt; + frames[count].size = pkt_size; + frames[count].timestamp.u64 = ts->u64 + count*ippc->samples_per_frame; + ++count; + } + + *frame_cnt = count; + return PJ_SUCCESS; +} + +/* + * Encode frames. + */ +static pj_status_t ipp_codec_encode( pjmedia_codec *codec, + const struct pjmedia_frame *input, + unsigned output_buf_len, + struct pjmedia_frame *output) +{ + ipp_private_t *codec_data = (ipp_private_t*) codec->codec_data; + struct ipp_codec *ippc = &ipp_codec[codec_data->codec_idx]; + unsigned samples_per_frame; + unsigned nsamples; + pj_size_t tx = 0; + pj_int16_t *pcm_in = (pj_int16_t*)input->buf; + pj_uint8_t *bits_out = (pj_uint8_t*) output->buf; + pj_uint8_t pt; + + /* Invoke external VAD if codec has no internal VAD */ + if (codec_data->vad && codec_data->vad_enabled) { + pj_bool_t is_silence; + pj_int32_t silence_duration; + + silence_duration = pj_timestamp_diff32(&codec_data->last_tx, + &input->timestamp); + + is_silence = pjmedia_silence_det_detect(codec_data->vad, + (const pj_int16_t*) input->buf, + (input->size >> 1), + NULL); + if (is_silence && + PJMEDIA_CODEC_MAX_SILENCE_PERIOD != -1 && + silence_duration < (PJMEDIA_CODEC_MAX_SILENCE_PERIOD * + (int)ippc->clock_rate / 1000)) + { + output->type = PJMEDIA_FRAME_TYPE_NONE; + output->buf = NULL; + output->size = 0; + output->timestamp = input->timestamp; + return PJ_SUCCESS; + } else { + codec_data->last_tx = input->timestamp; + } + } + + nsamples = input->size >> 1; + samples_per_frame = ippc->samples_per_frame; + pt = ippc->pt; + + PJ_ASSERT_RETURN(nsamples % samples_per_frame == 0, + PJMEDIA_CODEC_EPCMFRMINLEN); + + /* Encode the frames */ + while (nsamples >= samples_per_frame) { + USC_PCMStream in; + USC_Bitstream out; + + in.bitrate = codec_data->info->params.modes.bitrate; + in.nbytes = samples_per_frame << 1; + in.pBuffer = (char*)pcm_in; + in.pcmType.bitPerSample = codec_data->info->params.pcmType.bitPerSample; + in.pcmType.nChannels = codec_data->info->params.pcmType.nChannels; + in.pcmType.sample_frequency = codec_data->info->params.pcmType.sample_frequency; + + out.pBuffer = (char*)bits_out; + +#if PJMEDIA_HAS_INTEL_IPP_CODEC_AMR + /* For AMR: reserve two octets for AMR frame info */ + if (pt == PJMEDIA_RTP_PT_AMR || pt == PJMEDIA_RTP_PT_AMRWB) { + out.pBuffer += 2; + } +#endif + + if (USC_NoError != ippc->fxns->Encode(codec_data->enc, &in, &out)) { + break; + } + +#if PJMEDIA_HAS_INTEL_IPP_CODEC_AMR + /* For AMR: put info (frametype, degraded, last frame, mode) in the + * first two octets for payload packing. + */ + if (pt == PJMEDIA_RTP_PT_AMR || pt == PJMEDIA_RTP_PT_AMRWB) { + pj_uint16_t *info = (pj_uint16_t*)bits_out; + + /* Two octets for AMR frame info, 0=LSB: + * bit 0-3 : frame type + * bit 6 : last frame flag + * bit 7 : quality flag + * bit 8-11 : mode + */ + out.nbytes += 2; + if (out.frametype == 0 || out.frametype == 4 || + (pt == PJMEDIA_RTP_PT_AMR && out.frametype == 5) || + (pt == PJMEDIA_RTP_PT_AMRWB && out.frametype == 6)) + { + /* Speech frame type */ + *info = (char)pjmedia_codec_amr_get_mode(out.bitrate); + /* Quality */ + if (out.frametype == 5 || out.frametype == 6) + *info |= 0x80; + } else if (out.frametype == 1 || out.frametype == 2 || + (pt == PJMEDIA_RTP_PT_AMR && out.frametype == 6) || + (pt == PJMEDIA_RTP_PT_AMRWB && out.frametype == 7)) + { + /* SID frame type */ + *info = (pj_uint8_t)(pt == PJMEDIA_RTP_PT_AMRWB? 9 : 8); + /* Quality */ + if (out.frametype == 6 || out.frametype == 7) + *info |= 0x80; + } else { + /* Untransmited */ + *info = 15; + out.nbytes = 2; + } + + /* Mode */ + *info |= (char)pjmedia_codec_amr_get_mode(out.bitrate) << 8; + + /* Last frame flag */ + if (nsamples == samples_per_frame) + *info |= 0x40; + } +#endif + + pcm_in += samples_per_frame; + nsamples -= samples_per_frame; + tx += out.nbytes; + bits_out += out.nbytes; + +#if PJMEDIA_HAS_INTEL_IPP_CODEC_G729 + if (pt == PJMEDIA_RTP_PT_G729) { + if (out.frametype == 1) { + /* SID */ + break; + } else if (out.frametype == 0) { + /* Untransmitted */ + tx -= out.nbytes; + break; + } + } +#endif + + } + + if (ippc->pack != NULL) { + ippc->pack(codec_data, output->buf, &tx, output_buf_len); + } + + /* Check if we don't need to transmit the frame (DTX) */ + if (tx == 0) { + output->buf = NULL; + output->size = 0; + output->timestamp.u64 = input->timestamp.u64; + output->type = PJMEDIA_FRAME_TYPE_NONE; + return PJ_SUCCESS; + } + + output->size = tx; + output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->timestamp = input->timestamp; + + return PJ_SUCCESS; +} + +/* + * Decode frame. + */ +static pj_status_t ipp_codec_decode( pjmedia_codec *codec, + const struct pjmedia_frame *input, + unsigned output_buf_len, + struct pjmedia_frame *output) +{ + ipp_private_t *codec_data = (ipp_private_t*) codec->codec_data; + struct ipp_codec *ippc = &ipp_codec[codec_data->codec_idx]; + unsigned samples_per_frame; + USC_PCMStream out; + USC_Bitstream in; + pj_uint8_t pt; + + pt = ippc->pt; + samples_per_frame = ippc->samples_per_frame; + + PJ_ASSERT_RETURN(output_buf_len >= samples_per_frame << 1, + PJMEDIA_CODEC_EPCMTOOSHORT); + + if (input->type == PJMEDIA_FRAME_TYPE_AUDIO) { + if (ippc->predecode) { + ippc->predecode(codec_data, input, &in); + } else { + /* Most IPP codecs have frametype==0 for speech frame */ + in.pBuffer = (char*)input->buf; + in.nbytes = input->size; + in.frametype = 0; + in.bitrate = codec_data->info->params.modes.bitrate; + } + + out.pBuffer = output->buf; + } + + if (input->type != PJMEDIA_FRAME_TYPE_AUDIO || + USC_NoError != ippc->fxns->Decode(codec_data->dec, &in, &out)) + { + pjmedia_zero_samples((pj_int16_t*)output->buf, samples_per_frame); + output->size = samples_per_frame << 1; + output->timestamp.u64 = input->timestamp.u64; + output->type = PJMEDIA_FRAME_TYPE_AUDIO; + return PJ_SUCCESS; + } + +#if PJMEDIA_HAS_INTEL_IPP_CODEC_G726 + /* For G.726: amplify decoding result (USC G.726 encoder deamplified it) */ + if (pt == PJMEDIA_RTP_PT_G726_16 || pt == PJMEDIA_RTP_PT_G726_24 || + pt == PJMEDIA_RTP_PT_G726_32 || pt == PJMEDIA_RTP_PT_G726_40) + { + unsigned i; + pj_int16_t *s = (pj_int16_t*)output->buf; + + for (i = 0; i < samples_per_frame; ++i) + s[i] <<= 2; + } +#endif + + output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->size = samples_per_frame << 1; + output->timestamp.u64 = input->timestamp.u64; + + /* Invoke external PLC if codec has no internal PLC */ + if (codec_data->plc && codec_data->plc_enabled) + pjmedia_plc_save(codec_data->plc, (pj_int16_t*)output->buf); + + return PJ_SUCCESS; +} + +/* + * Recover lost frame. + */ +static pj_status_t ipp_codec_recover(pjmedia_codec *codec, + unsigned output_buf_len, + struct pjmedia_frame *output) +{ + ipp_private_t *codec_data = (ipp_private_t*) codec->codec_data; + struct ipp_codec *ippc = &ipp_codec[codec_data->codec_idx]; + unsigned samples_per_frame; + + PJ_UNUSED_ARG(output_buf_len); + + samples_per_frame = ippc->samples_per_frame; + + output->type = PJMEDIA_FRAME_TYPE_AUDIO; + output->size = samples_per_frame << 1; + + if (codec_data->plc_enabled) { + if (codec_data->plc) { + pjmedia_plc_generate(codec_data->plc, (pj_int16_t*)output->buf); + } else { + USC_PCMStream out; + out.pBuffer = output->buf; + ippc->fxns->Decode(codec_data->dec, NULL, &out); + } + } else { + pjmedia_zero_samples((pj_int16_t*)output->buf, samples_per_frame); + } + + return PJ_SUCCESS; +} + + +#if defined(_MSC_VER) && PJMEDIA_AUTO_LINK_IPP_LIBS +# pragma comment( lib, "ippcore.lib") +# pragma comment( lib, "ipps.lib") +# pragma comment( lib, "ippsc.lib") +# pragma comment( lib, "ippsr.lib") +# pragma comment( lib, "usc.lib") +#endif + + +#endif /* PJMEDIA_HAS_INTEL_IPP */ + diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/l16.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/l16.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia-codec/l16.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/l16.c index c757cdbc283c7a82b73ffacf92f2a670b0dfdde5..2f69f3e3f45054b7020cda2e86ccaf5be8914c78 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/l16.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/l16.c @@ -1,6 +1,7 @@ -/* $Id: l16.c 2247 2008-08-26 20:09:03Z nanang $ */ +/* $Id: l16.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/speex_codec.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/speex_codec.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia-codec/speex_codec.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/speex_codec.c index 68a331c8d8be0a83b839236da774f9a1f2a0c84f..be0e4b4c9f56a9a700de64c91178ae39dc95b4c8 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia-codec/speex_codec.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/speex_codec.c @@ -1,6 +1,7 @@ -/* $Id: speex_codec.c 2250 2008-08-27 17:57:32Z nanang $ */ +/* $Id: speex_codec.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/alaw_ulaw.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/alaw_ulaw.c similarity index 100% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/alaw_ulaw.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/alaw_ulaw.c diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/alaw_ulaw_table.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/alaw_ulaw_table.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/alaw_ulaw_table.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/alaw_ulaw_table.c index cc455a2f4e039162652bf612c49b19706a26d18a..8392c1f566e17c56a4a6a04a4b001c28528cf5a3 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/alaw_ulaw_table.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/alaw_ulaw_table.c @@ -1,5 +1,6 @@ -/* $Id: alaw_ulaw_table.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: alaw_ulaw_table.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/bidirectional.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/bidirectional.c similarity index 94% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/bidirectional.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/bidirectional.c index 7c82f49e8ab704000aea5bcdbc9d1d6e84796f80..fe5ea2180bc067d12730e8af8ad94475781ccf40 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/bidirectional.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/bidirectional.c @@ -1,5 +1,6 @@ -/* $Id: bidirectional.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: bidirectional.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/clock_thread.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/clock_thread.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/clock_thread.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/clock_thread.c index 69d42da74c49c0874dd0639b7b1542e71bbea10a..94c24274bfcffd2f61697fe9cc6aa7df9ef86c17 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/clock_thread.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/clock_thread.c @@ -1,5 +1,6 @@ -/* $Id: clock_thread.c 2075 2008-06-27 16:18:13Z nanang $ */ +/* $Id: clock_thread.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/codec.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/codec.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/codec.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/codec.c index 79a14591997e50262913a8adc15e86b0240c22c7..9fe0e2dbdc9eefb4bebb284d9830ad0e0b1e155e 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/codec.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/codec.c @@ -1,5 +1,6 @@ -/* $Id: codec.c 2061 2008-06-26 15:48:14Z bennylp $ */ +/* $Id: codec.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/conference.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/conference.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/conference.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/conference.c index 8ea2d977e628b8ae1733173fa8dc4f05fd89410b..c46444f8badaf28a0b294ef0b1cfdda78e460b68 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/conference.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/conference.c @@ -1,5 +1,6 @@ -/* $Id: conference.c 2233 2008-08-22 15:45:08Z nanang $ */ +/* $Id: conference.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -1831,9 +1832,11 @@ static pj_status_t get_frame(pjmedia_port *this_port, /* Put this level to port's last RX level. */ conf_port->rx_level = level; + // Ticket #671: Skipping very low audio signal may cause noise + // to be generated in the remote end by some hardphones. /* Skip processing frame if level is zero */ - if (level == 0) - continue; + //if (level == 0) + // continue; /* Add the signal to all listeners. */ for (cj=0; cj < conf_port->listener_cnt; ++cj) diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/delaybuf.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/delaybuf.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/delaybuf.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/delaybuf.c index 7a04a3426fb67ef6186f3c454381fc32593b2c32..9fd748bc4193635e24f8c4a4c42d4d8c682de5b9 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/delaybuf.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/delaybuf.c @@ -1,5 +1,6 @@ -/* $Id: delaybuf.c 2311 2008-09-23 18:48:56Z nanang $ */ +/* $Id: delaybuf.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/dsound.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/dsound.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/dsound.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/dsound.c index f05993635d5fbf1044be12a9870869023a684a65..1497467a497e11a796ede2189b76519f5d26b1cf 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/dsound.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/dsound.c @@ -1,5 +1,6 @@ -/* $Id: dsound.c 2296 2008-09-19 13:28:40Z nanang $ */ +/* $Id: dsound.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/echo_common.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_common.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/echo_common.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_common.c index 31f2ac52b37a3ca8880557862906bdbe6b5851c7..fb13055976677bc939388c47fce006fc5159f354 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/echo_common.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_common.c @@ -1,5 +1,6 @@ -/* $Id: echo_common.c 2198 2008-08-09 05:40:22Z bennylp $ */ +/* $Id: echo_common.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/echo_internal.h b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_internal.h similarity index 95% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/echo_internal.h rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_internal.h index 62a9c468145f7f3a24462229c0909a9bd95ca1e1..f70ed708e7f7588e98ac41bf23af73e996e4ffb0 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/echo_internal.h +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_internal.h @@ -1,5 +1,6 @@ -/* $Id: echo_internal.h 2198 2008-08-09 05:40:22Z bennylp $ */ +/* $Id: echo_internal.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/echo_port.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_port.c similarity index 97% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/echo_port.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_port.c index ea23cd5a10d623a1238d3c164db2d3d17009e23d..233d5ad3923fb60572f1fa062e1b301043561e2e 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/echo_port.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_port.c @@ -1,5 +1,6 @@ -/* $Id: echo_port.c 2198 2008-08-09 05:40:22Z bennylp $ */ +/* $Id: echo_port.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/echo_speex.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_speex.c similarity index 97% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/echo_speex.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_speex.c index 5be9b1d980ea78cc517a25982276d965b088a253..9975c842250dc08dd5e2c365efdf688f40c36656 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/echo_speex.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_speex.c @@ -1,5 +1,6 @@ -/* $Id: echo_speex.c 2252 2008-08-28 10:44:46Z bennylp $ */ +/* $Id: echo_speex.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/echo_suppress.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_suppress.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/echo_suppress.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_suppress.c index 65b0929a963741fdebb7427f71f6b66f1ccb6960..60ee9b454c17983a46a67b9a095e1f3fafbfdfbc 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/echo_suppress.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_suppress.c @@ -1,5 +1,6 @@ -/* $Id: echo_suppress.c 2329 2008-09-27 11:53:39Z nanang $ */ +/* $Id: echo_suppress.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -121,7 +122,7 @@ typedef enum talk_state ST_REM_SILENT, ST_DOUBLETALK, ST_REM_TALK -} talk_state; +} talk_state_t; const char *state_names[] = { @@ -225,7 +226,7 @@ typedef struct echo_supp pj_uint16_t tail_samples; /* Tail length in samples. */ pj_bool_t learning; /* Are we still learning yet? */ - talk_state talk_state; /* Current talking state */ + talk_state_t talk_state; /* Current talking state */ int tail_index; /* Echo location, -1 if not found */ unsigned max_calc; /* # of calc before learning complete. @@ -391,7 +392,7 @@ PJ_DEF(void) echo_supp_soft_reset(void *state) /* Set state */ -static void echo_supp_set_state(echo_supp *ec, enum talk_state state, +static void echo_supp_set_state(echo_supp *ec, talk_state_t state, unsigned level) { PJ_UNUSED_ARG(level); diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/endpoint.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/endpoint.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/endpoint.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/endpoint.c index 2815423fde0aa955d00a63f9953ac3a1f0f4ed5f..e4b0eed55f3bfa23923a7e23afead0d5129b46b0 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/endpoint.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/endpoint.c @@ -1,5 +1,6 @@ -/* $Id: endpoint.c 2236 2008-08-25 13:58:25Z nanang $ */ +/* $Id: endpoint.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/errno.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/errno.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/errno.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/errno.c index d9c3beab93e2d3df9d7873d9c3c7ca729b1dee68..95d23f47feeaf310050be5e02c54b378d1912157 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/errno.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/errno.c @@ -1,5 +1,6 @@ -/* $Id: errno.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: errno.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/g711.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/g711.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/g711.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/g711.c index ac4586c124a084ede3f006d96222159199df7343..f595fb9877d71c8b9b6f4772447a9218dde830c7 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/g711.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/g711.c @@ -1,5 +1,6 @@ -/* $Id: g711.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: g711.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/jbuf.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/jbuf.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/jbuf.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/jbuf.c index cbf763b7b0d1c49fa8b192d30ccbf38cc6459287..ba8c4e6238b152fb958cf63cb24d66ef79656573 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/jbuf.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/jbuf.c @@ -1,5 +1,6 @@ -/* $Id: jbuf.c 2321 2008-09-25 11:46:06Z nanang $ */ +/* $Id: jbuf.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/master_port.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/master_port.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/master_port.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/master_port.c index ec9748541b848bac8542a7d3edd428487fca8ee7..e604af7b6224b90e9d343f3f687f407ef40e3087 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/master_port.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/master_port.c @@ -1,5 +1,6 @@ -/* $Id: master_port.c 2075 2008-06-27 16:18:13Z nanang $ */ +/* $Id: master_port.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/mem_capture.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/mem_capture.c similarity index 97% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/mem_capture.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/mem_capture.c index 0503ba0d9ad6940f8aef2c9722d8a0628f339138..4c998dd0a6ac4ce073d838ba2b28bdec8d8b9808 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/mem_capture.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/mem_capture.c @@ -1,5 +1,6 @@ -/* $Id: mem_capture.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: mem_capture.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/mem_player.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/mem_player.c similarity index 97% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/mem_player.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/mem_player.c index 23f7bd14dd6ead2eb61e3edea8564a48e07657c6..11f7220af041e847f0fae7bc47ad8c9c72eba134 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/mem_player.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/mem_player.c @@ -1,5 +1,6 @@ -/* $Id: mem_player.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: mem_player.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/null_port.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/null_port.c similarity index 95% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/null_port.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/null_port.c index c31fe43167a0fe88966b8686d75a945de0e2fb01..57d76d6998f1ba21e582d6aac71e44b1e0693e17 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/null_port.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/null_port.c @@ -1,5 +1,6 @@ -/* $Id: null_port.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: null_port.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/nullsound.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/nullsound.c similarity index 97% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/nullsound.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/nullsound.c index d10c1e41ef22a24eed5efb6372a396bec41cabfa..8bc245509ca2d5582adbe1c8f62f40a49d8ee0db 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/nullsound.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/nullsound.c @@ -1,5 +1,6 @@ -/* $Id: nullsound.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: nullsound.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/pasound.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/pasound.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/pasound.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/pasound.c index 68aa3fb022d27a174a187afc16f95c011ac191e3..000862424bcffadd7085feb204d2dfb477faf618 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/pasound.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/pasound.c @@ -1,5 +1,6 @@ -/* $Id: pasound.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pasound.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/plc_common.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/plc_common.c similarity index 96% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/plc_common.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/plc_common.c index e6419c2911963ff2b13fbd147666d3be6ca2e780..b05096410b75d36f865aa904eb32096276a867d8 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/plc_common.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/plc_common.c @@ -1,5 +1,6 @@ -/* $Id: plc_common.c 2143 2008-07-14 17:59:31Z nanang $ */ +/* $Id: plc_common.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/port.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/port.c similarity index 96% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/port.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/port.c index adde1c01ddf09f702afd32518b66329a6300140e..6da062490f27d98ad01f36089ab0e3805f0d8890 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/port.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/port.c @@ -1,5 +1,6 @@ -/* $Id: port.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: port.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/resample_libsamplerate.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_libsamplerate.c similarity index 97% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/resample_libsamplerate.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_libsamplerate.c index f011ca1e76b83eb6d9b9e3de8ead4a92723ee4f1..63ce87ac54e91e6309fb745c7bdaaa12dbca3d39 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/resample_libsamplerate.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_libsamplerate.c @@ -1,5 +1,6 @@ -/* $Id: resample_libsamplerate.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: resample_libsamplerate.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/resample_port.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_port.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/resample_port.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_port.c index 9b856e738947131d153de5e7433ce9ccbc830a5e..588833531b0f17bcc880a90e9fc511c766a72cf0 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/resample_port.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_port.c @@ -1,5 +1,6 @@ -/* $Id: resample_port.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: resample_port.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/resample_resample.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_resample.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/resample_resample.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_resample.c index 41bfbea5b7e043f2fba9328881f8d6a218f48b66..7efbbbe12180791f56b8cdf6055b9226cd0dce45 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/resample_resample.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_resample.c @@ -1,5 +1,6 @@ -/* $Id: resample_resample.c 2228 2008-08-20 11:19:43Z nanang $ */ +/* $Id: resample_resample.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/resample_speex.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_speex.c similarity index 96% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/resample_speex.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_speex.c index 3426fa7adaec2da34e4331ed1c432da68e048cd4..9c414c43aabff0a929a68c168263453019b9fb89 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/resample_speex.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_speex.c @@ -1,5 +1,6 @@ -/* $Id: resample_speex.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: resample_speex.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/rtcp.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/rtcp.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp.c index 85a4df825a95d4320c6fa048ad328aa2d6007e14..9fded1e5ef580f38348a50efd7dafa609242ceef 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/rtcp.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp.c @@ -1,5 +1,6 @@ -/* $Id: rtcp.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: rtcp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/rtcp_xr.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp_xr.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/rtcp_xr.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp_xr.c index 0f6a63bd08cf9233a263ad9a805c558e7e3b1fce..6abd0f6b2632db452f672b5bc3d8e6e7d5dc13e6 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/rtcp_xr.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp_xr.c @@ -1,5 +1,6 @@ -/* $Id: rtcp_xr.c 2007 2008-06-12 12:48:59Z nanang $ */ +/* $Id: rtcp_xr.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/rtp.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtp.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/rtp.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtp.c index d01d181b2f2b69a7eb15a1032e67f3bce543aeae..e383e964ee9f4a5df33edbddac12939e512349d6 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/rtp.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtp.c @@ -1,5 +1,6 @@ -/* $Id: rtp.c 2241 2008-08-26 16:51:28Z nanang $ */ +/* $Id: rtp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/sdp.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/sdp.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp.c index 58d0f2793b5edf92eed5f3fbcbf9195c5312a83b..8103988a3a00f14d08dd59593e4189c068f61234 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/sdp.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp.c @@ -1,5 +1,6 @@ -/* $Id: sdp.c 2076 2008-06-27 18:47:05Z bennylp $ */ +/* $Id: sdp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -1110,14 +1111,15 @@ PJ_DEF(pj_status_t) pjmedia_sdp_parse( pj_pool_t *pool, parse_version(&scanner, &ctx); break; case 13: - /* Allow empty newline at the end of the message */ - pj_scan_get_char(&scanner); - /* Continue below */ case 10: pj_scan_get_char(&scanner); - if (!pj_scan_is_eof(&scanner)) { - ctx.last_error = PJMEDIA_SDP_EINSDP; - on_scanner_error(&scanner); + /* Allow empty newlines at the end of the message */ + while (!pj_scan_is_eof(&scanner)) { + if (*scanner.curptr != 13 && *scanner.curptr != 10) { + ctx.last_error = PJMEDIA_SDP_EINSDP; + on_scanner_error(&scanner); + } + pj_scan_get_char(&scanner); } break; default: diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/sdp_cmp.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp_cmp.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/sdp_cmp.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp_cmp.c index 6c5c8dc4170da4e3df0cfc1f83e18cbf254b9ce5..986df3f57f31a6fb4164c95881b398468e2bb24d 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/sdp_cmp.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp_cmp.c @@ -1,5 +1,6 @@ -/* $Id: sdp_cmp.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sdp_cmp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/sdp_neg.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp_neg.c similarity index 78% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/sdp_neg.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp_neg.c index cc54e43498c13a443d4bbaf40e9873c81e4ab6ee..7d14c9e265c93a19cbf2f5276f4f9cae9f17ee44 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/sdp_neg.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp_neg.c @@ -1,5 +1,6 @@ -/* $Id: sdp_neg.c 2236 2008-08-25 13:58:25Z nanang $ */ +/* $Id: sdp_neg.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -51,6 +52,20 @@ static const char *state_str[] = "STATE_DONE", }; +#define GET_FMTP_IVAL(ival, fmtp, param, default_val) \ + do { \ + pj_str_t s; \ + char *p; \ + p = pj_stristr(&fmtp.fmt_param, ¶m); \ + if (!p) { \ + ival = default_val; \ + break; \ + } \ + pj_strset(&s, p + param.slen, fmtp.fmt_param.slen - \ + (p - fmtp.fmt_param.ptr) - param.slen); \ + ival = pj_strtoul(&s); \ + } while (0) + /* * Get string representation of negotiator state. */ @@ -540,44 +555,183 @@ static pj_bool_t match_g7221( const pjmedia_sdp_media *offer, const pjmedia_sdp_media *answer, unsigned a_fmt_idx) { - const pjmedia_sdp_attr *a_ans; - const pjmedia_sdp_attr *a_off; + const pjmedia_sdp_attr *attr_ans; + const pjmedia_sdp_attr *attr_ofr; pjmedia_sdp_fmtp fmtp; - unsigned a_bitrate = 0, o_bitrate = 0; + unsigned a_bitrate, o_bitrate; const pj_str_t bitrate = {"bitrate=", 8}; - const char *p; - - a_ans = pjmedia_sdp_media_find_attr2(answer, "fmtp", - &answer->desc.fmt[a_fmt_idx]); - if (!a_ans) - return PJ_FALSE; - if (pjmedia_sdp_attr_get_fmtp(a_ans, &fmtp) != PJ_SUCCESS) + /* Parse offer */ + attr_ofr = pjmedia_sdp_media_find_attr2(offer, "fmtp", + &offer->desc.fmt[o_fmt_idx]); + if (!attr_ofr) return PJ_FALSE; - p = pj_stristr(&fmtp.fmt_param, &bitrate); - if (p == NULL) + if (pjmedia_sdp_attr_get_fmtp(attr_ofr, &fmtp) != PJ_SUCCESS) return PJ_FALSE; - a_bitrate = atoi(p + bitrate.slen); + GET_FMTP_IVAL(o_bitrate, fmtp, bitrate, 0); - a_off = pjmedia_sdp_media_find_attr2(offer, "fmtp", - &offer->desc.fmt[o_fmt_idx]); - if (!a_off) + /* Parse answer */ + attr_ans = pjmedia_sdp_media_find_attr2(answer, "fmtp", + &answer->desc.fmt[a_fmt_idx]); + if (!attr_ans) return PJ_FALSE; - if (pjmedia_sdp_attr_get_fmtp(a_off, &fmtp) != PJ_SUCCESS) + if (pjmedia_sdp_attr_get_fmtp(attr_ans, &fmtp) != PJ_SUCCESS) return PJ_FALSE; - p = pj_stristr(&fmtp.fmt_param, &bitrate); - if (p == NULL) - return PJ_FALSE; - - o_bitrate = atoi(p + bitrate.slen); + GET_FMTP_IVAL(a_bitrate, fmtp, bitrate, 0); + /* Compare bitrate in answer and offer. */ return (a_bitrate == o_bitrate); } +/* Negotiate AMR format params between offer and answer. Format params + * to be matched are: octet-align, crc, robust-sorting, interleaving, + * and channels (channels is negotiated by rtpmap line negotiation). + * Note: For answerer, octet-align mode setting is adaptable to offerer + * setting. In the case that octet-align mode need to be adjusted, + * pt_need_adapt will be set to the format ID. + * + */ +static pj_bool_t match_amr( const pjmedia_sdp_media *offer, + unsigned o_fmt_idx, + const pjmedia_sdp_media *answer, + unsigned a_fmt_idx, + pj_bool_t answerer, + pj_str_t *pt_need_adapt) +{ + /* Negotiated format-param field-names constants. */ + const pj_str_t STR_OCTET_ALIGN = {"octet-align=", 12}; + const pj_str_t STR_CRC = {"crc=", 4}; + const pj_str_t STR_ROBUST_SORTING = {"robust-sorting=", 15}; + const pj_str_t STR_INTERLEAVING = {"interleaving=", 13}; + + /* Negotiated params and their default values. */ + unsigned a_octet_align = 0, o_octet_align = 0; + unsigned a_crc = 0, o_crc = 0; + unsigned a_robust_sorting = 0, o_robust_sorting = 0; + unsigned a_interleaving = 0, o_interleaving = 0; + + const pjmedia_sdp_attr *attr_ans; + const pjmedia_sdp_attr *attr_ofr; + pjmedia_sdp_fmtp fmtp; + pj_bool_t match; + + /* Parse offerer FMTP */ + attr_ofr = pjmedia_sdp_media_find_attr2(offer, "fmtp", + &offer->desc.fmt[o_fmt_idx]); + if (attr_ofr) { + if (pjmedia_sdp_attr_get_fmtp(attr_ofr, &fmtp) != PJ_SUCCESS) + /* Invalid fmtp format. */ + return PJ_FALSE; + + GET_FMTP_IVAL(o_octet_align, fmtp, STR_OCTET_ALIGN, 0); + GET_FMTP_IVAL(o_crc, fmtp, STR_CRC, 0); + GET_FMTP_IVAL(o_robust_sorting, fmtp, STR_ROBUST_SORTING, 0); + GET_FMTP_IVAL(o_interleaving, fmtp, STR_INTERLEAVING, 0); + } + + /* Parse answerer FMTP */ + attr_ans = pjmedia_sdp_media_find_attr2(answer, "fmtp", + &answer->desc.fmt[a_fmt_idx]); + if (attr_ans) { + if (pjmedia_sdp_attr_get_fmtp(attr_ans, &fmtp) != PJ_SUCCESS) + /* Invalid fmtp format. */ + return PJ_FALSE; + + GET_FMTP_IVAL(a_octet_align, fmtp, STR_OCTET_ALIGN, 0); + GET_FMTP_IVAL(a_crc, fmtp, STR_CRC, 0); + GET_FMTP_IVAL(a_robust_sorting, fmtp, STR_ROBUST_SORTING, 0); + GET_FMTP_IVAL(a_interleaving, fmtp, STR_INTERLEAVING, 0); + } + + if (answerer) { + match = a_crc == o_crc && + a_robust_sorting == o_robust_sorting && + a_interleaving == o_interleaving; + + /* If answerer octet-align setting doesn't match to the offerer's, + * set pt_need_adapt to this media format ID to signal the caller + * that this format ID needs to be adjusted. + */ + if (a_octet_align != o_octet_align && match) { + pj_assert(pt_need_adapt != NULL); + *pt_need_adapt = answer->desc.fmt[a_fmt_idx]; + } + } else { + match = (a_octet_align == o_octet_align && + a_crc == o_crc && + a_robust_sorting == o_robust_sorting && + a_interleaving == o_interleaving); + } + + return match; +} + + +/* Toggle AMR octet-align setting in the fmtp. + */ +static pj_status_t amr_toggle_octet_align(pj_pool_t *pool, + pjmedia_sdp_media *media, + unsigned fmt_idx) +{ + pjmedia_sdp_attr *attr; + pjmedia_sdp_fmtp fmtp; + const pj_str_t STR_OCTET_ALIGN = {"octet-align=", 12}; + + enum { MAX_FMTP_STR_LEN = 160 }; + + attr = pjmedia_sdp_media_find_attr2(media, "fmtp", + &media->desc.fmt[fmt_idx]); + /* Check if the AMR media format has FMTP attribute */ + if (attr) { + char *p; + pj_status_t status; + + status = pjmedia_sdp_attr_get_fmtp(attr, &fmtp); + if (status != PJ_SUCCESS) + return status; + + /* Check if the fmtp has octet-align field. */ + p = pj_stristr(&fmtp.fmt_param, &STR_OCTET_ALIGN); + if (p) { + /* It has, just toggle the value */ + unsigned octet_align; + pj_str_t s; + + pj_strset(&s, p + STR_OCTET_ALIGN.slen, fmtp.fmt_param.slen - + (p - fmtp.fmt_param.ptr) - STR_OCTET_ALIGN.slen); + octet_align = pj_strtoul(&s); + *(p + STR_OCTET_ALIGN.slen) = (char)(octet_align? '0' : '1'); + } else { + /* It doesn't, append octet-align field */ + char buf[MAX_FMTP_STR_LEN]; + + pj_ansi_snprintf(buf, MAX_FMTP_STR_LEN, "%.*s;octet-align=1", + (int)fmtp.fmt_param.slen, fmtp.fmt_param.ptr); + attr->value = pj_strdup3(pool, buf); + } + } else { + /* Add new attribute for the AMR media format with octet-align + * field set. + */ + char buf[MAX_FMTP_STR_LEN]; + + attr = PJ_POOL_ZALLOC_T(pool, pjmedia_sdp_attr); + attr->name = pj_str("fmtp"); + pj_ansi_snprintf(buf, MAX_FMTP_STR_LEN, "%.*s octet-align=1", + (int)media->desc.fmt[fmt_idx].slen, + media->desc.fmt[fmt_idx].ptr); + attr->value = pj_strdup3(pool, buf); + media->attr[media->attr_count++] = attr; + } + + return PJ_SUCCESS; +} + + /* Update single local media description to after receiving answer * from remote. */ @@ -706,6 +860,12 @@ static pj_status_t process_m_answer( pj_pool_t *pool, if (pj_strcmp2(&or_.enc_name, "G7221") == 0) { if (match_g7221(offer, i, answer, j)) break; + } else + /* Further check for AMR, negotiate fmtp. */ + if (pj_strcmp2(&or_.enc_name, "AMR") == 0) { + if (match_amr(offer, i, answer, j, PJ_FALSE, + NULL)) + break; } else { /* Match! */ break; @@ -818,42 +978,53 @@ static pj_status_t process_answer(pj_pool_t *pool, /* Try to match offer with answer. */ static pj_status_t match_offer(pj_pool_t *pool, + pj_bool_t prefer_remote_codec_order, const pjmedia_sdp_media *offer, const pjmedia_sdp_media *preanswer, - const pjmedia_sdp_media *orig_local, pjmedia_sdp_media **p_answer) { unsigned i; - pj_bool_t offer_has_codec = 0, - offer_has_telephone_event = 0, - offer_has_other = 0, + pj_bool_t master_has_codec = 0, + master_has_telephone_event = 0, + master_has_other = 0, found_matching_codec = 0, found_matching_telephone_event = 0, found_matching_other = 0; unsigned pt_answer_count = 0; pj_str_t pt_answer[PJMEDIA_MAX_SDP_FMT]; pjmedia_sdp_media *answer; + const pjmedia_sdp_media *master, *slave; + pj_str_t pt_amr_need_adapt = {NULL, 0}; + /* Set master/slave negotiator based on prefer_remote_codec_order. */ + if (prefer_remote_codec_order) { + master = offer; + slave = preanswer; + } else { + master = preanswer; + slave = offer; + } + /* With the addition of telephone-event and dodgy MS RTC SDP, * the answer generation algorithm looks really shitty... */ - for (i=0; idesc.fmt_count; ++i) { + for (i=0; idesc.fmt_count; ++i) { unsigned j; - if (pj_isdigit(*offer->desc.fmt[i].ptr)) { + if (pj_isdigit(*master->desc.fmt[i].ptr)) { /* This is normal/standard payload type, where it's identified * by payload number. */ unsigned pt; - pt = pj_strtoul(&offer->desc.fmt[i]); + pt = pj_strtoul(&master->desc.fmt[i]); if (pt < 96) { /* For static payload type, it's enough to compare just * the payload number. */ - offer_has_codec = 1; + master_has_codec = 1; /* We just need to select one codec. * Continue if we have selected matching codec for previous @@ -863,12 +1034,12 @@ static pj_status_t match_offer(pj_pool_t *pool, continue; /* Find matching codec in local descriptor. */ - for (j=0; jdesc.fmt_count; ++j) { + for (j=0; jdesc.fmt_count; ++j) { unsigned p; - p = pj_strtoul(&preanswer->desc.fmt[j]); - if (p == pt && pj_isdigit(*preanswer->desc.fmt[j].ptr)) { + p = pj_strtoul(&slave->desc.fmt[j]); + if (p == pt && pj_isdigit(*slave->desc.fmt[j].ptr)) { found_matching_codec = 1; - pt_answer[pt_answer_count++] = preanswer->desc.fmt[j]; + pt_answer[pt_answer_count++] = slave->desc.fmt[j]; break; } } @@ -882,9 +1053,9 @@ static pj_status_t match_offer(pj_pool_t *pool, pjmedia_sdp_rtpmap or_; pj_bool_t is_codec; - /* Get the rtpmap for the payload type in the offer. */ - a = pjmedia_sdp_media_find_attr2(offer, "rtpmap", - &offer->desc.fmt[i]); + /* Get the rtpmap for the payload type in the master. */ + a = pjmedia_sdp_media_find_attr2(master, "rtpmap", + &master->desc.fmt[i]); if (!a) { pj_assert(!"Bug! Offer should have been validated"); return PJMEDIA_SDP_EMISSINGRTPMAP; @@ -892,12 +1063,12 @@ static pj_status_t match_offer(pj_pool_t *pool, pjmedia_sdp_attr_get_rtpmap(a, &or_); if (!pj_strcmp2(&or_.enc_name, "telephone-event")) { - offer_has_telephone_event = 1; + master_has_telephone_event = 1; if (found_matching_telephone_event) continue; is_codec = 0; } else { - offer_has_codec = 1; + master_has_codec = 1; if (found_matching_codec) continue; is_codec = 1; @@ -906,9 +1077,9 @@ static pj_status_t match_offer(pj_pool_t *pool, /* Find paylaod in our initial SDP with matching * encoding name and clock rate. */ - for (j=0; jdesc.fmt_count; ++j) { - a = pjmedia_sdp_media_find_attr2(preanswer, "rtpmap", - &preanswer->desc.fmt[j]); + for (j=0; jdesc.fmt_count; ++j) { + a = pjmedia_sdp_media_find_attr2(slave, "rtpmap", + &slave->desc.fmt[j]); if (a) { pjmedia_sdp_rtpmap lr; pjmedia_sdp_attr_get_rtpmap(a, &lr); @@ -923,18 +1094,32 @@ static pj_status_t match_offer(pj_pool_t *pool, { /* Match! */ if (is_codec) { - /* Further check for G7221, negotiate bitrate. */ - if (pj_strcmp2(&or_.enc_name, "G7221") == 0 && - match_g7221(offer, i, preanswer, j) == 0) + /* Further check for G7221, negotiate bitrate */ + if (pj_strcmp2(&or_.enc_name, "G7221") == 0 && + !match_g7221(master, i, slave, j)) { continue; + } else + /* Further check for AMR, negotiate fmtp */ + if (pj_strcmp2(&or_.enc_name, "AMR")==0) { + unsigned o_med_idx, a_med_idx; + + o_med_idx = prefer_remote_codec_order? i:j; + a_med_idx = prefer_remote_codec_order? j:i; + if (!match_amr(offer, o_med_idx, + preanswer, a_med_idx, + PJ_TRUE, &pt_amr_need_adapt)) + continue; } found_matching_codec = 1; } else { found_matching_telephone_event = 1; } - pt_answer[pt_answer_count++] = preanswer->desc.fmt[j]; + pt_answer[pt_answer_count++] = + prefer_remote_codec_order? + preanswer->desc.fmt[j]: + preanswer->desc.fmt[i]; break; } } @@ -948,23 +1133,25 @@ static pj_status_t match_offer(pj_pool_t *pool, * Example: * - m=x-ms-message 5060 sip null */ - offer_has_other = 1; + master_has_other = 1; if (found_matching_other) continue; - for (j=0; jdesc.fmt_count; ++j) { - if (!pj_strcmp(&offer->desc.fmt[i], &preanswer->desc.fmt[j])) { + for (j=0; jdesc.fmt_count; ++j) { + if (!pj_strcmp(&master->desc.fmt[i], &slave->desc.fmt[j])) { /* Match */ found_matching_other = 1; - pt_answer[pt_answer_count++] = preanswer->desc.fmt[j]; + pt_answer[pt_answer_count++] = prefer_remote_codec_order? + preanswer->desc.fmt[j]: + preanswer->desc.fmt[i]; break; } } } } - /* See if all types of offer can be matched. */ - if (offer_has_codec && !found_matching_codec) { + /* See if all types of master can be matched. */ + if (master_has_codec && !found_matching_codec) { return PJMEDIA_SDPNEG_NOANSCODEC; } @@ -976,15 +1163,15 @@ static pj_status_t match_offer(pj_pool_t *pool, } */ - if (offer_has_other && !found_matching_other) { + if (master_has_other && !found_matching_other) { return PJMEDIA_SDPNEG_NOANSUNKNOWN; } /* Seems like everything is in order. - * Build the answer by cloning from local media, but rearrange the payload + * Build the answer by cloning from preanswer, but rearrange the payload * to suit the offer. */ - answer = pjmedia_sdp_media_clone(pool, orig_local); + answer = pjmedia_sdp_media_clone(pool, preanswer); for (i=0; idesc.fmt_count; ++j) { @@ -993,6 +1180,10 @@ static pj_status_t match_offer(pj_pool_t *pool, } pj_assert(j != answer->desc.fmt_count); str_swap(&answer->desc.fmt[i], &answer->desc.fmt[j]); + + /* For AMR/AMRWB format, adapt octet-align setting if required. */ + if (!pj_strcmp(&pt_amr_need_adapt, &pt_answer[i])) + amr_toggle_octet_align(pool, answer, i); } /* Remove unwanted local formats. */ @@ -1016,7 +1207,7 @@ static pj_status_t match_offer(pj_pool_t *pool, answer->desc.fmt_count = pt_answer_count; /* If offer has zero port, set our answer with zero port too */ - if (offer->desc.port==0) + if (offer->desc.port == 0) answer->desc.port = 0; /* Update media direction. */ @@ -1076,12 +1267,8 @@ static pj_status_t create_answer( pj_pool_t *pool, media_used[j] == 0) { /* See if it has matching codec. */ - if (prefer_remote_codec_order) { - status = match_offer(pool, om, im, im, &am); - } else { - status = match_offer(pool, im, om, im, &am); - } - + status = match_offer(pool, prefer_remote_codec_order, + om, im, &am); if (status == PJ_SUCCESS) { /* Mark media as used. */ media_used[j] = 1; diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/session.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/session.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/session.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/session.c index be45db07439b4031b74f2e4baf6a88d853b5594f..6dbabe1e948f6ff8cb612f536db09f378219aff1 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/session.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/session.c @@ -1,5 +1,6 @@ -/* $Id: session.c 2299 2008-09-19 21:18:23Z nanang $ */ +/* $Id: session.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/silencedet.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/silencedet.c similarity index 96% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/silencedet.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/silencedet.c index b1588a3a8f448c0097c33b875486501fd53b3588..0b93062679904c47949a6d807bfe4d51cb8b4472 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/silencedet.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/silencedet.c @@ -1,6 +1,7 @@ -/* $Id: silencedet.c 2230 2008-08-21 20:57:31Z bennylp $ */ +/* $Id: silencedet.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,8 +26,8 @@ #define THIS_FILE "silencedet.c" -#if 0 -# define TRACE_(x) PJ_LOG(3,x) +#if 1 +# define TRACE_(x) PJ_LOG(5,x) #else # define TRACE_(x) #endif @@ -222,7 +223,9 @@ PJ_DEF(pj_bool_t) pjmedia_silence_det_apply( pjmedia_silence_det *sd, ++sd->sum_cnt; avg_recent_level = (sd->sum_level / sd->sum_cnt); - if (level > sd->threshold) { + if (level > sd->threshold || + level >= PJMEDIA_SILENCE_DET_MAX_THRESHOLD) + { sd->silence_timer = 0; sd->voiced_timer += sd->ptime; diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/sound_port.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sound_port.c similarity index 96% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/sound_port.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/sound_port.c index 7c37df87e6da36d80fadfb6133ce74ae9468c24c..00f9a5b4309c6fbb0064f74b7ced867a64c72012 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/sound_port.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sound_port.c @@ -1,5 +1,6 @@ -/* $Id: sound_port.c 2198 2008-08-09 05:40:22Z bennylp $ */ +/* $Id: sound_port.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -371,8 +372,6 @@ PJ_DEF(pj_status_t) pjmedia_snd_port_create( pj_pool_t *pool, pjmedia_snd_port **p_port) { pjmedia_snd_port *snd_port; - pj_status_t status; - unsigned ptime; PJ_ASSERT_RETURN(pool && p_port, PJ_EINVAL); @@ -389,17 +388,19 @@ PJ_DEF(pj_status_t) pjmedia_snd_port_create( pj_pool_t *pool, snd_port->bits_per_sample = bits_per_sample; #if PJMEDIA_SOUND_USE_DELAYBUF - ptime = samples_per_frame * 1000 / (clock_rate * channel_count); - - status = pjmedia_delay_buf_create(pool, "snd_buff", - clock_rate, samples_per_frame, - channel_count, - PJMEDIA_SOUND_BUFFER_COUNT * ptime, - 0, &snd_port->delay_buf); - PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); -#else - PJ_UNUSED_ARG(status); - PJ_UNUSED_ARG(ptime); + do { + pj_status_t status; + unsigned ptime; + + ptime = samples_per_frame * 1000 / (clock_rate * channel_count); + + status = pjmedia_delay_buf_create(pool, "snd_buff", + clock_rate, samples_per_frame, + channel_count, + PJMEDIA_SOUND_BUFFER_COUNT * ptime, + 0, &snd_port->delay_buf); + PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); + } while (0); #endif *p_port = snd_port; diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/splitcomb.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/splitcomb.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/splitcomb.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/splitcomb.c index 69f80db4006e6ebc07b43171f823434845578a86..08457b8bff7f071737337e0abf0145ce520cd350 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/splitcomb.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/splitcomb.c @@ -1,5 +1,6 @@ -/* $Id: splitcomb.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: splitcomb.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/stereo_port.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/stereo_port.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/stereo_port.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/stereo_port.c index b4ad338a546b8be1349df96afbea558b431c5aa7..97ee6dcd92610ca7e156dd201179e3895f0cf978 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/stereo_port.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/stereo_port.c @@ -1,5 +1,6 @@ -/* $Id: stereo_port.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: stereo_port.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/stream.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/stream.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/stream.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/stream.c index 223a27459f4f733ef8f1331c6d1bb65f28d823fe..2493f065fde1d2679fae4ca4c4824f54077ebefc 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/stream.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/stream.c @@ -1,5 +1,6 @@ -/* $Id: stream.c 2328 2008-09-27 11:50:17Z nanang $ */ +/* $Id: stream.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/symbian_sound.cpp b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/symbian_sound.cpp similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/symbian_sound.cpp rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/symbian_sound.cpp index 0f6fb12b29c08e2c8df0fa6fdd997bcf427a635c..9aa762fa408205ffe6e5d175a484e058e82bade9 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/symbian_sound.cpp +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/symbian_sound.cpp @@ -1,6 +1,7 @@ -/* $Id: symbian_sound.cpp 2007 2008-06-12 12:48:59Z nanang $ */ +/* $Id: symbian_sound.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -297,7 +298,7 @@ void CPjAudioInputEngine::Stop() // Wait until it's actually stopped while (lastError_ == KRequestPending) - pj_thread_sleep(100); + pj_symbianos_poll(-1, 100); } if (iInputStream_) { @@ -533,7 +534,7 @@ void CPjAudioOutputEngine::Stop() // Wait until it's actually stopped while (lastError_ == KRequestPending) - pj_thread_sleep(100); + pj_symbianos_poll(-1, 100); } if (iOutputStream_) { @@ -850,8 +851,10 @@ PJ_DEF(pj_status_t) pjmedia_snd_stream_get_info(pjmedia_snd_stream *strm, pi->channel_count = strm->channel_count; pi->samples_per_frame = strm->samples_per_frame; pi->bits_per_sample = BYTES_PER_SAMPLE * 8; - pi->rec_latency = 0; - pi->play_latency = 0; + // Symbian uses 4096 bytes buffer (~2048 samples/256 ms) for PCM rec & play. + // The latencies below are rounded up to be a multiplication of 80. + pi->rec_latency = 2080; + pi->play_latency = 2080; return PJ_SUCCESS; } diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/symbian_sound_aps.cpp b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/symbian_sound_aps.cpp similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/symbian_sound_aps.cpp rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/symbian_sound_aps.cpp index 8437adecc15a2066f668996ed782608c5ce550b3..4240769c34151829b82e72c936da3ae79ebc2523 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/symbian_sound_aps.cpp +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/symbian_sound_aps.cpp @@ -1,5 +1,6 @@ -/* $Id: symbian_sound_aps.cpp 2174 2008-07-24 15:30:44Z nanang $ */ +/* $Id: symbian_sound_aps.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -728,8 +729,9 @@ PJ_DEF(pj_status_t) pjmedia_snd_stream_get_info(pjmedia_snd_stream *strm, pi->channel_count = strm->channel_count; pi->samples_per_frame = strm->samples_per_frame; pi->bits_per_sample = BYTES_PER_SAMPLE * 8; - pi->rec_latency = 0; - pi->play_latency = 0; + // latencies approximation (in samples) + pi->rec_latency = strm->samples_per_frame * 2; + pi->play_latency = strm->samples_per_frame * 2; return PJ_SUCCESS; } diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/tonegen.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/tonegen.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/tonegen.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/tonegen.c index 920633269dc9219765d0bc670bfe20607864dfb4..9338fe8b0a54ba7875f5f74089cb31a1b7c7789d 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/tonegen.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/tonegen.c @@ -1,5 +1,6 @@ -/* $Id: tonegen.c 2313 2008-09-24 09:38:55Z bennylp $ */ +/* $Id: tonegen.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/transport_adapter_sample.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_adapter_sample.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/transport_adapter_sample.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_adapter_sample.c index 72f6e0b2e6aa4a59cb9468d487ee37db1c9629f4..b42ffd6f587eeecb140515da2dbe8d9492030190 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/transport_adapter_sample.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_adapter_sample.c @@ -1,5 +1,6 @@ -/* $Id: transport_adapter_sample.c 2262 2008-09-04 13:55:33Z bennylp $ */ +/* $Id: transport_adapter_sample.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -131,7 +132,8 @@ PJ_DEF(pj_status_t) pjmedia_tp_adapter_create( pjmedia_endpt *endpt, adapter->pool = pool; pj_ansi_strncpy(adapter->base.name, pool->obj_name, sizeof(adapter->base.name)); - adapter->base.type = PJMEDIA_TRANSPORT_TYPE_USER + 1; + adapter->base.type = (pjmedia_transport_type) + (PJMEDIA_TRANSPORT_TYPE_USER + 1); adapter->base.op = &tp_adapter_op; /* Save the transport as the slave transport */ diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/transport_ice.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_ice.c similarity index 94% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/transport_ice.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_ice.c index d0b49043337101ee77b6fbe1fbbebb5c45fc81d5..94b93a22697bd1b14583cec0e51e17016e142be5 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/transport_ice.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_ice.c @@ -1,5 +1,6 @@ -/* $Id: transport_ice.c 2345 2008-10-08 10:14:03Z nanang $ */ +/* $Id: transport_ice.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -594,6 +595,14 @@ static pj_status_t encode_session_in_sdp(struct transport_ice *tp_ice, /* ICE has failed, application should have terminated this call */ } + /* Removing a=rtcp line when there is only one component. */ + if (comp_cnt == 1) { + attr = pjmedia_sdp_attr_find(m->attr_count, m->attr, &STR_RTCP, NULL); + if (attr) + pjmedia_sdp_attr_remove(&m->attr_count, m->attr, attr); + } + + return PJ_SUCCESS; } @@ -748,9 +757,9 @@ static pj_status_t verify_ice_sdp(struct transport_ice *tp_ice, struct sdp_state *sdp_state) { const pjmedia_sdp_media *rem_m; - const pjmedia_sdp_attr *attr, *ufrag_attr, *pwd_attr; + const pjmedia_sdp_attr *ufrag_attr, *pwd_attr; const pjmedia_sdp_conn *rem_conn; - pj_bool_t comp1_found=PJ_FALSE, comp2_found=PJ_FALSE; + pj_bool_t comp1_found=PJ_FALSE, comp2_found=PJ_FALSE, has_rtcp=PJ_FALSE; pj_sockaddr rem_conn_addr, rtcp_addr; unsigned i; pj_status_t status; @@ -767,7 +776,7 @@ static pj_status_t verify_ice_sdp(struct transport_ice *tp_ice, } /* Verify that default target for each component matches one of the - * candidatefor the component. Otherwise stop ICE with ICE ice_mismatch + * candidate for the component. Otherwise stop ICE with ICE ice_mismatch * error. */ @@ -793,44 +802,62 @@ static pj_status_t verify_ice_sdp(struct transport_ice *tp_ice, if (status != PJ_SUCCESS) return status; - /* Component 2 is a=rtcp line, if present. */ - attr = pjmedia_sdp_attr_find(rem_m->attr_count, rem_m->attr, - &STR_RTCP, NULL); - if (attr && tp_ice->comp_cnt > 1) { - pjmedia_sdp_rtcp_attr rtcp_attr; + if (tp_ice->comp_cnt > 1) { + const pjmedia_sdp_attr *attr; - status = pjmedia_sdp_attr_get_rtcp(attr, &rtcp_attr); - if (status != PJ_SUCCESS) { - /* Error parsing a=rtcp attribute */ - return status; - } - - /* Verify address family matches */ - if ((tp_ice->af==pj_AF_INET() && - pj_strcmp(&rtcp_attr.addr_type, &STR_IP4)!=0) || - (tp_ice->af==pj_AF_INET6() && - pj_strcmp(&rtcp_attr.addr_type, &STR_IP6)!=0)) - { - return PJMEDIA_SDP_ETPORTNOTEQUAL; - } + /* Get default RTCP candidate from a=rtcp line, if present, otherwise + * calculate default RTCP candidate from default RTP target. + */ + attr = pjmedia_sdp_attr_find(rem_m->attr_count, rem_m->attr, + &STR_RTCP, NULL); + has_rtcp = (attr != NULL); - /* Assign RTCP address */ - status = pj_sockaddr_init(tp_ice->af, &rtcp_addr, - &rtcp_attr.addr, - (pj_uint16_t)rtcp_attr.port); - if (status != PJ_SUCCESS) { - return PJMEDIA_SDP_EINRTCP; - } + if (attr) { + pjmedia_sdp_rtcp_attr rtcp_attr; - sdp_state->match_comp_cnt = 2; + status = pjmedia_sdp_attr_get_rtcp(attr, &rtcp_attr); + if (status != PJ_SUCCESS) { + /* Error parsing a=rtcp attribute */ + return status; + } + + if (rtcp_attr.addr.slen) { + /* Verify address family matches */ + if ((tp_ice->af==pj_AF_INET() && + pj_strcmp(&rtcp_attr.addr_type, &STR_IP4)!=0) || + (tp_ice->af==pj_AF_INET6() && + pj_strcmp(&rtcp_attr.addr_type, &STR_IP6)!=0)) + { + return PJMEDIA_SDP_ETPORTNOTEQUAL; + } - } else { - /* Don't have RTCP component */ - comp2_found = PJ_TRUE; - sdp_state->match_comp_cnt = 1; + /* Assign RTCP address */ + status = pj_sockaddr_init(tp_ice->af, &rtcp_addr, + &rtcp_attr.addr, + (pj_uint16_t)rtcp_attr.port); + if (status != PJ_SUCCESS) { + return PJMEDIA_SDP_EINRTCP; + } + } else { + /* Assign RTCP address */ + status = pj_sockaddr_init(tp_ice->af, &rtcp_addr, + NULL, + (pj_uint16_t)rtcp_attr.port); + if (status != PJ_SUCCESS) { + return PJMEDIA_SDP_EINRTCP; + } + pj_sockaddr_copy_addr(&rtcp_addr, &rem_conn_addr); + } + } else { + unsigned rtcp_port; + + rtcp_port = pj_sockaddr_get_port(&rem_conn_addr) + 1; + pj_sockaddr_cp(&rtcp_addr, &rem_conn_addr); + pj_sockaddr_set_port(&rtcp_addr, (pj_uint16_t)rtcp_port); + } } - /* Find the default address in a=candidate attributes. + /* Find the default addresses in a=candidate attributes. */ for (i=0; iattr_count; ++i) { pj_ice_sess_cand cand; @@ -852,28 +879,33 @@ static pj_status_t verify_ice_sdp(struct transport_ice *tp_ice, if (!comp1_found && cand.comp_id==COMP_RTP && pj_sockaddr_cmp(&rem_conn_addr, &cand.addr)==0) { - /* Found */ comp1_found = PJ_TRUE; - if (comp1_found && comp2_found) - break; } else if (!comp2_found && cand.comp_id==COMP_RTCP && pj_sockaddr_cmp(&rtcp_addr, &cand.addr)==0) { - /* Found */ comp2_found = PJ_TRUE; - if (comp1_found && comp2_found) - break; } + if (cand.comp_id == COMP_RTCP) + has_rtcp = PJ_TRUE; + + if (comp1_found && (comp2_found || tp_ice->comp_cnt==1)) + break; } - if (!comp1_found || !comp2_found) { - /* ICE ice_mismatch */ - sdp_state->ice_mismatch = PJ_TRUE; - } else { + /* Check matched component count and ice_mismatch */ + if (comp1_found && (tp_ice->comp_cnt==1 || !has_rtcp)) { + sdp_state->match_comp_cnt = 1; + sdp_state->ice_mismatch = PJ_FALSE; + } else if (comp1_found && comp2_found) { + sdp_state->match_comp_cnt = 2; sdp_state->ice_mismatch = PJ_FALSE; + } else { + sdp_state->match_comp_cnt = (tp_ice->comp_cnt > 1 && has_rtcp)? 2 : 1; + sdp_state->ice_mismatch = PJ_TRUE; } + /* Detect remote restarting session */ if (pj_ice_strans_has_sess(tp_ice->ice_st) && (pj_ice_strans_sess_is_running(tp_ice->ice_st) || diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/transport_loop.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_loop.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/transport_loop.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_loop.c index 4b2fbfff9ea61c5334304b02ae58c3cd13467b05..77018ab72a5d808cfa78a60475a0a42b6605cde5 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/transport_loop.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_loop.c @@ -1,5 +1,6 @@ -/* $Id: transport_loop.c 2101 2008-07-04 16:45:17Z bennylp $ */ +/* $Id: transport_loop.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/transport_srtp.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_srtp.c similarity index 97% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/transport_srtp.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_srtp.c index 64dbff96e25eb0b9cdb9e6a4940b9f8d2045bdf8..2fb6845ee9b697a8e714e3218d5b37eae53132e4 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/transport_srtp.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_srtp.c @@ -1,5 +1,6 @@ -/* $Id: transport_srtp.c 2242 2008-08-26 16:59:10Z nanang $ */ +/* $Id: transport_srtp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -260,6 +261,8 @@ const char* get_libsrtp_errstr(int err) #endif } +static void pjmedia_srtp_deinit_lib(void); + static pj_status_t pjmedia_srtp_init_lib(void) { static pj_bool_t initialized = PJ_FALSE; @@ -273,12 +276,32 @@ static pj_status_t pjmedia_srtp_init_lib(void) return PJMEDIA_ERRNO_FROM_LIBSRTP(err); } + if (pj_atexit(pjmedia_srtp_deinit_lib) != PJ_SUCCESS) { + /* There will be memory leak when it fails to schedule libsrtp + * deinitialization, however the memory leak could be harmless, + * since in modern OS's memory used by an application is released + * when the application terminates. + */ + PJ_LOG(4, (THIS_FILE, "Failed to register libsrtp deinit.")); + } + initialized = PJ_TRUE; } return PJ_SUCCESS; } +static void pjmedia_srtp_deinit_lib(void) +{ + err_status_t err; + + err = srtp_deinit(); + if (err != err_status_ok) { + PJ_LOG(4, (THIS_FILE, "Failed to deinitialize libsrtp: %s", + get_libsrtp_errstr(err))); + } +} + static int get_crypto_idx(const pj_str_t* crypto_name) { int i; @@ -624,18 +647,23 @@ static pj_status_t transport_attach(pjmedia_transport *tp, transport_srtp *srtp = (transport_srtp*) tp; pj_status_t status; - /* Attach itself to transport */ - status = pjmedia_transport_attach(srtp->member_tp, srtp, rem_addr, rem_rtcp, - addr_len, &srtp_rtp_cb, &srtp_rtcp_cb); - if (status != PJ_SUCCESS) - return status; - /* Save the callbacks */ srtp->rtp_cb = rtp_cb; srtp->rtcp_cb = rtcp_cb; srtp->user_data = user_data; - return status; + /* Attach itself to transport */ + status = pjmedia_transport_attach(srtp->member_tp, srtp, rem_addr, + rem_rtcp, addr_len, &srtp_rtp_cb, + &srtp_rtcp_cb); + if (status != PJ_SUCCESS) { + srtp->rtp_cb = NULL; + srtp->rtcp_cb = NULL; + srtp->user_data = NULL; + return status; + } + + return PJ_SUCCESS; } static void transport_detach(pjmedia_transport *tp, void *strm) diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/transport_udp.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_udp.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/transport_udp.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_udp.c index 90a3e47dd3a205b853705edcfa16e7225e100f00..d429d8b59f223f619861a7f06c00127840529ab3 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/transport_udp.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_udp.c @@ -1,5 +1,6 @@ -/* $Id: transport_udp.c 2293 2008-09-18 12:58:33Z nanang $ */ +/* $Id: transport_udp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/wav_player.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_player.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/wav_player.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_player.c index 27e659ff55ddf01636bd41a94deb1c125ff42916..8a2547fb6fdab29ce40a248579c985bb522231a2 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/wav_player.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_player.c @@ -1,5 +1,6 @@ -/* $Id: wav_player.c 2272 2008-09-11 10:17:10Z nanang $ */ +/* $Id: wav_player.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -263,7 +264,7 @@ PJ_DEF(pj_status_t) pjmedia_wav_player_port_create( pj_pool_t *pool, return status; } - fport->fmt_tag = wave_hdr.fmt_hdr.fmt_tag; + fport->fmt_tag = (pjmedia_wave_fmt_tag)wave_hdr.fmt_hdr.fmt_tag; fport->bytes_per_sample = (pj_uint16_t) (wave_hdr.fmt_hdr.bits_per_sample / 8); diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/wav_playlist.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_playlist.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/wav_playlist.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_playlist.c index e73339c2e007cd8943e1393ac2df1ab29e6f6bef..5c5345b224e4effc47f34a70a279c837b559f65a 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/wav_playlist.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_playlist.c @@ -1,5 +1,6 @@ -/* $Id: wav_playlist.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: wav_playlist.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * Original author: diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/wav_writer.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_writer.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/wav_writer.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_writer.c index 336e8b1138df8691427343d587e4111712913434..df6a3edc2304c2a57e9b94aa22c5bfa8b3d3f4e1 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/wav_writer.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_writer.c @@ -1,5 +1,6 @@ -/* $Id: wav_writer.c 2335 2008-10-01 08:45:33Z bennylp $ */ +/* $Id: wav_writer.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/wave.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wave.c similarity index 94% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/wave.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/wave.c index 0016056a9c1f3c5c24c6f1c5e55bed726527f394..b229924333ca9cbe5690db027f1ce1f8c8ec2a64 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/wave.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wave.c @@ -1,5 +1,6 @@ -/* $Id: wave.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: wave.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/wmme_sound.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wmme_sound.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/wmme_sound.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/wmme_sound.c index 298a1b1741a9cc6823630ec0242e63f5d1d50dab..8f94660c8f3047476655a1844e1e57cf98f41f2e 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/wmme_sound.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wmme_sound.c @@ -40,7 +40,7 @@ struct wmme_dev_info static unsigned dev_count; static struct wmme_dev_info dev_info[MAX_HARDWARE]; -static int snd_init_count; +static pj_bool_t snd_initialized = PJ_FALSE; /* Latency settings */ static unsigned snd_input_latency = PJMEDIA_SND_DEFAULT_REC_LATENCY; @@ -483,9 +483,11 @@ PJ_DEF(pj_status_t) pjmedia_snd_init(pj_pool_factory *factory) int i; int inputDeviceCount, outputDeviceCount, maximumPossibleDeviceCount; - if (++snd_init_count != 1) + if (snd_initialized) return PJ_SUCCESS; + pj_bzero(&dev_info, sizeof(dev_info)); + dev_count = 0; pool_factory = factory; @@ -617,7 +619,7 @@ PJ_DEF(pj_status_t) pjmedia_snd_init(pj_pool_factory *factory) */ PJ_DEF(pj_status_t) pjmedia_snd_deinit(void) { - --snd_init_count; + snd_initialized = PJ_FALSE; return PJ_SUCCESS; } diff --git a/libs/pjproject-1.0/pjmedia/src/pjmedia/wsola.c b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wsola.c similarity index 97% rename from libs/pjproject-1.0/pjmedia/src/pjmedia/wsola.c rename to libs/pjproject-1.0.1/pjmedia/src/pjmedia/wsola.c index 6234c6b3648689c38338ef928c042379ad351cf1..9bbcddb5a566ff21c5613a66362741021cffd1ad 100644 --- a/libs/pjproject-1.0/pjmedia/src/pjmedia/wsola.c +++ b/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wsola.c @@ -1,5 +1,6 @@ -/* $Id: wsola.c 2277 2008-09-15 11:16:57Z nanang $ */ +/* $Id: wsola.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -30,6 +31,17 @@ */ #define THIS_FILE "wsola.c" +/* + * http://trac.pjsip.org/repos/ticket/683: + * Workaround for segfault problem in the fixed point version of create_win() + * on ARM9 platform, possibly due to gcc optimization bug. + * + * For now, we will use linear window when floating point is disabled. + */ +#ifndef PJMEDIA_WSOLA_LINEAR_WIN +# define PJMEDIA_WSOLA_LINEAR_WIN (!PJ_HAS_FLOATING_POINT) +#endif + #if 0 # define TRACE_(x) PJ_LOG(4,x) @@ -368,7 +380,7 @@ static void overlapp_add_simple(pj_int16_t dst[], unsigned count, } } -#if PJ_HAS_INT64 +#if PJ_HAS_INT64 && !PJMEDIA_WSOLA_LINEAR_WIN /* approx_cos(): * see: http://www.audiomulch.com/~rossb/code/sinusoids/ */ @@ -388,7 +400,7 @@ static pj_uint32_t approx_cos( pj_uint32_t x ) return j; } -#endif /* PJ_HAS_INT64 */ +#endif /* PJ_HAS_INT64 && .. */ static void create_win(pj_pool_t *pool, pj_uint16_t **pw, unsigned count) { @@ -400,7 +412,7 @@ static void create_win(pj_pool_t *pool, pj_uint16_t **pw, unsigned count) *pw = w; for (i=0; i * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/test/jbuf_test.c b/libs/pjproject-1.0.1/pjmedia/src/test/jbuf_test.c similarity index 97% rename from libs/pjproject-1.0/pjmedia/src/test/jbuf_test.c rename to libs/pjproject-1.0.1/pjmedia/src/test/jbuf_test.c index 1e94524cf50c10337459d81e23638a4f464cdf79..c8a5681fdc4ecab99518f8b3e7c8554aea30830f 100644 --- a/libs/pjproject-1.0/pjmedia/src/test/jbuf_test.c +++ b/libs/pjproject-1.0.1/pjmedia/src/test/jbuf_test.c @@ -1,5 +1,6 @@ /* $Id$ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/test/main.c b/libs/pjproject-1.0.1/pjmedia/src/test/main.c similarity index 92% rename from libs/pjproject-1.0/pjmedia/src/test/main.c rename to libs/pjproject-1.0.1/pjmedia/src/test/main.c index e8e121ed3c8c9e71c77d2491a7653676b10554ae..d36c8e4d7292e106cdf1944cb6b8f8a9f223474f 100644 --- a/libs/pjproject-1.0/pjmedia/src/test/main.c +++ b/libs/pjproject-1.0.1/pjmedia/src/test/main.c @@ -1,5 +1,6 @@ -/* $Id: main.c 2344 2008-10-07 20:23:01Z bennylp $ */ +/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -43,4 +44,5 @@ int main(int argc, char *argv[]) return rc; } - \ No newline at end of file + + diff --git a/libs/pjproject-1.0/pjmedia/src/test/mips_test.c b/libs/pjproject-1.0.1/pjmedia/src/test/mips_test.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/test/mips_test.c rename to libs/pjproject-1.0.1/pjmedia/src/test/mips_test.c index 1ce0de318dd585c29e072469bd606018d0116992..91f49c8b52780260e12c18ca6aa880c2342be78d 100644 --- a/libs/pjproject-1.0/pjmedia/src/test/mips_test.c +++ b/libs/pjproject-1.0.1/pjmedia/src/test/mips_test.c @@ -1,5 +1,6 @@ -/* $Id: mips_test.c 2212 2008-08-13 18:21:03Z bennylp $ */ +/* $Id: mips_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -419,7 +420,8 @@ static pjmedia_port* create_gen_port(pj_pool_t *pool, pj_int16_t *buf; unsigned c; - buf = pj_pool_alloc(pool, sizeof(ref_signal)*channel_count); + buf = (pj_int16_t*) + pj_pool_alloc(pool, sizeof(ref_signal)*channel_count); for (c=0; c * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/test/sdp_neg_test.c b/libs/pjproject-1.0.1/pjmedia/src/test/sdp_neg_test.c similarity index 99% rename from libs/pjproject-1.0/pjmedia/src/test/sdp_neg_test.c rename to libs/pjproject-1.0.1/pjmedia/src/test/sdp_neg_test.c index c865a1a9a769c8cf9e6f137397caceadc626f15a..b86c2e34bdd36d2dfbceb90d6a970c9944e190a3 100644 --- a/libs/pjproject-1.0/pjmedia/src/test/sdp_neg_test.c +++ b/libs/pjproject-1.0.1/pjmedia/src/test/sdp_neg_test.c @@ -1,5 +1,6 @@ -/* $Id: sdp_neg_test.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sdp_neg_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/test/sdptest.c b/libs/pjproject-1.0.1/pjmedia/src/test/sdptest.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/test/sdptest.c rename to libs/pjproject-1.0.1/pjmedia/src/test/sdptest.c index 4278a3ee63fc5ef85385fd33b883e75a25695c5d..9a2e2ffe6d93b81f7ae8ba67f0f40dbb5a12c44f 100644 --- a/libs/pjproject-1.0/pjmedia/src/test/sdptest.c +++ b/libs/pjproject-1.0.1/pjmedia/src/test/sdptest.c @@ -1,5 +1,6 @@ /* $Id$ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/test/session_test.c b/libs/pjproject-1.0.1/pjmedia/src/test/session_test.c similarity index 98% rename from libs/pjproject-1.0/pjmedia/src/test/session_test.c rename to libs/pjproject-1.0.1/pjmedia/src/test/session_test.c index 475ef04f443413670784877e1ee1cd3dbda23556..b9c2d519abf851f2bae6d1165e9a2e983c9e0913 100644 --- a/libs/pjproject-1.0/pjmedia/src/test/session_test.c +++ b/libs/pjproject-1.0.1/pjmedia/src/test/session_test.c @@ -1,5 +1,6 @@ /* $Id$ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/test/test.c b/libs/pjproject-1.0.1/pjmedia/src/test/test.c similarity index 97% rename from libs/pjproject-1.0/pjmedia/src/test/test.c rename to libs/pjproject-1.0.1/pjmedia/src/test/test.c index b89dfa258c0c693b1df163d74eda1d95bbd10faf..2bae030b1a4352c84bba6bfcf3e61847e904a7e9 100644 --- a/libs/pjproject-1.0/pjmedia/src/test/test.c +++ b/libs/pjproject-1.0.1/pjmedia/src/test/test.c @@ -1,5 +1,6 @@ /* $Id$ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/test/test.h b/libs/pjproject-1.0.1/pjmedia/src/test/test.h similarity index 90% rename from libs/pjproject-1.0/pjmedia/src/test/test.h rename to libs/pjproject-1.0.1/pjmedia/src/test/test.h index 28a31caada910b6bb1b99a7e0e1edf8c1cbe7fd2..8df57deb2362a6dad934b51850366e4cdc7ae172 100644 --- a/libs/pjproject-1.0/pjmedia/src/test/test.h +++ b/libs/pjproject-1.0.1/pjmedia/src/test/test.h @@ -1,5 +1,6 @@ -/* $Id: test.h 2101 2008-07-04 16:45:17Z bennylp $ */ +/* $Id: test.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjmedia/src/test/wince_main.c b/libs/pjproject-1.0.1/pjmedia/src/test/wince_main.c similarity index 93% rename from libs/pjproject-1.0/pjmedia/src/test/wince_main.c rename to libs/pjproject-1.0.1/pjmedia/src/test/wince_main.c index 99adf799eb5f62b521b7e9fcda470a8664e5af1c..0c32793c9028cbd007f117cb67b1f5dfe5bd9a43 100644 --- a/libs/pjproject-1.0/pjmedia/src/test/wince_main.c +++ b/libs/pjproject-1.0.1/pjmedia/src/test/wince_main.c @@ -1,6 +1,7 @@ /* $Id:$ */ /* - * Copyright (C)2003-2008 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjmedia/src/test/wsola_test.c b/libs/pjproject-1.0.1/pjmedia/src/test/wsola_test.c similarity index 100% rename from libs/pjproject-1.0/pjmedia/src/test/wsola_test.c rename to libs/pjproject-1.0.1/pjmedia/src/test/wsola_test.c diff --git a/libs/pjproject-1.0/pjnath/build/pjnath.dsp b/libs/pjproject-1.0.1/pjnath/build/pjnath.dsp similarity index 100% rename from libs/pjproject-1.0/pjnath/build/pjnath.dsp rename to libs/pjproject-1.0.1/pjnath/build/pjnath.dsp diff --git a/libs/pjproject-1.0/pjnath/build/pjnath.dsw b/libs/pjproject-1.0.1/pjnath/build/pjnath.dsw similarity index 100% rename from libs/pjproject-1.0/pjnath/build/pjnath.dsw rename to libs/pjproject-1.0.1/pjnath/build/pjnath.dsw diff --git a/libs/pjproject-1.0/pjnath/build/pjnath.vcproj b/libs/pjproject-1.0.1/pjnath/build/pjnath.vcproj similarity index 100% rename from libs/pjproject-1.0/pjnath/build/pjnath.vcproj rename to libs/pjproject-1.0.1/pjnath/build/pjnath.vcproj diff --git a/libs/pjproject-1.0/pjnath/build/pjnath_test.dsp b/libs/pjproject-1.0.1/pjnath/build/pjnath_test.dsp similarity index 100% rename from libs/pjproject-1.0/pjnath/build/pjnath_test.dsp rename to libs/pjproject-1.0.1/pjnath/build/pjnath_test.dsp diff --git a/libs/pjproject-1.0/pjnath/build/pjnath_test.vcproj b/libs/pjproject-1.0.1/pjnath/build/pjnath_test.vcproj similarity index 100% rename from libs/pjproject-1.0/pjnath/build/pjnath_test.vcproj rename to libs/pjproject-1.0.1/pjnath/build/pjnath_test.vcproj diff --git a/libs/pjproject-1.0/pjnath/build/pjstun_srv_test.dsp b/libs/pjproject-1.0.1/pjnath/build/pjstun_srv_test.dsp similarity index 100% rename from libs/pjproject-1.0/pjnath/build/pjstun_srv_test.dsp rename to libs/pjproject-1.0.1/pjnath/build/pjstun_srv_test.dsp diff --git a/libs/pjproject-1.0/pjnath/build/pjstun_srv_test.vcproj b/libs/pjproject-1.0.1/pjnath/build/pjstun_srv_test.vcproj similarity index 100% rename from libs/pjproject-1.0/pjnath/build/pjstun_srv_test.vcproj rename to libs/pjproject-1.0.1/pjnath/build/pjstun_srv_test.vcproj diff --git a/libs/pjproject-1.0/pjnath/build/pjturn_client.dsp b/libs/pjproject-1.0.1/pjnath/build/pjturn_client.dsp similarity index 100% rename from libs/pjproject-1.0/pjnath/build/pjturn_client.dsp rename to libs/pjproject-1.0.1/pjnath/build/pjturn_client.dsp diff --git a/libs/pjproject-1.0/pjnath/build/pjturn_client.vcproj b/libs/pjproject-1.0.1/pjnath/build/pjturn_client.vcproj similarity index 100% rename from libs/pjproject-1.0/pjnath/build/pjturn_client.vcproj rename to libs/pjproject-1.0.1/pjnath/build/pjturn_client.vcproj diff --git a/libs/pjproject-1.0/pjnath/build/pjturn_srv.dsp b/libs/pjproject-1.0.1/pjnath/build/pjturn_srv.dsp similarity index 100% rename from libs/pjproject-1.0/pjnath/build/pjturn_srv.dsp rename to libs/pjproject-1.0.1/pjnath/build/pjturn_srv.dsp diff --git a/libs/pjproject-1.0/pjnath/build/wince-evc4/pjnath_test_wince.vcp b/libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_test_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjnath/build/wince-evc4/pjnath_test_wince.vcp rename to libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_test_wince.vcp diff --git a/libs/pjproject-1.0/pjnath/build/wince-evc4/pjnath_wince.vcp b/libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjnath/build/wince-evc4/pjnath_wince.vcp rename to libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_wince.vcp diff --git a/libs/pjproject-1.0/pjnath/build/wince-evc4/pjnath_wince.vcw b/libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_wince.vcw similarity index 100% rename from libs/pjproject-1.0/pjnath/build/wince-evc4/pjnath_wince.vcw rename to libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_wince.vcw diff --git a/libs/pjproject-1.0/pjnath/docs/UML-class-diagram.dia b/libs/pjproject-1.0.1/pjnath/docs/UML-class-diagram.dia similarity index 100% rename from libs/pjproject-1.0/pjnath/docs/UML-class-diagram.dia rename to libs/pjproject-1.0.1/pjnath/docs/UML-class-diagram.dia diff --git a/libs/pjproject-1.0/pjnath/docs/UML-class-diagram.png b/libs/pjproject-1.0.1/pjnath/docs/UML-class-diagram.png similarity index 100% rename from libs/pjproject-1.0/pjnath/docs/UML-class-diagram.png rename to libs/pjproject-1.0.1/pjnath/docs/UML-class-diagram.png diff --git a/libs/pjproject-1.0/pjnath/docs/doxygen.cfg b/libs/pjproject-1.0.1/pjnath/docs/doxygen.cfg similarity index 100% rename from libs/pjproject-1.0/pjnath/docs/doxygen.cfg rename to libs/pjproject-1.0.1/pjnath/docs/doxygen.cfg diff --git a/libs/pjproject-1.0/pjnath/docs/doxygen.css b/libs/pjproject-1.0.1/pjnath/docs/doxygen.css similarity index 100% rename from libs/pjproject-1.0/pjnath/docs/doxygen.css rename to libs/pjproject-1.0.1/pjnath/docs/doxygen.css diff --git a/libs/pjproject-1.0/pjnath/docs/footer.html b/libs/pjproject-1.0.1/pjnath/docs/footer.html similarity index 79% rename from libs/pjproject-1.0/pjnath/docs/footer.html rename to libs/pjproject-1.0.1/pjnath/docs/footer.html index a91856b4d90eef8d1ba19d35db1d47ffadea043e..35b0f94f80002b051265ff535b428d56794b33ed 100644 --- a/libs/pjproject-1.0/pjnath/docs/footer.html +++ b/libs/pjproject-1.0.1/pjnath/docs/footer.html @@ -1,7 +1,7 @@

 

PJNATH - Open Source NAT traversal helper library supporting STUN, TURN, and ICE
-(C)2001-2008 Benny Prijono +Copyright (C) 2006-2009 Teluu Inc.
diff --git a/libs/pjproject-1.0/pjnath/docs/header.html b/libs/pjproject-1.0.1/pjnath/docs/header.html similarity index 100% rename from libs/pjproject-1.0/pjnath/docs/header.html rename to libs/pjproject-1.0.1/pjnath/docs/header.html diff --git a/libs/pjproject-1.0/pjnath/docs/ice-arch.jpg b/libs/pjproject-1.0.1/pjnath/docs/ice-arch.jpg similarity index 100% rename from libs/pjproject-1.0/pjnath/docs/ice-arch.jpg rename to libs/pjproject-1.0.1/pjnath/docs/ice-arch.jpg diff --git a/libs/pjproject-1.0/pjnath/docs/stun-arch.jpg b/libs/pjproject-1.0.1/pjnath/docs/stun-arch.jpg similarity index 100% rename from libs/pjproject-1.0/pjnath/docs/stun-arch.jpg rename to libs/pjproject-1.0.1/pjnath/docs/stun-arch.jpg diff --git a/libs/pjproject-1.0/pjnath/include/pjnath.h b/libs/pjproject-1.0.1/pjnath/include/pjnath.h similarity index 86% rename from libs/pjproject-1.0/pjnath/include/pjnath.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath.h index 7c08a1e387ef7e81520b0706d1b5582e0401bc7d..6c1ebf1e34bc0af8e8f174c6893a48bf89d56463 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath.h @@ -1,6 +1,7 @@ -/* $Id: pjnath.h 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: pjnath.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/config.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/config.h similarity index 98% rename from libs/pjproject-1.0/pjnath/include/pjnath/config.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/config.h index 4ca3785991dceaf33c0fbb2902adff72b136b97f..b7bf10901054bbc47fb65e4848afd2efb9bd9fe0 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/config.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/config.h @@ -1,6 +1,7 @@ -/* $Id: config.h 2054 2008-06-25 21:16:46Z bennylp $ */ +/* $Id: config.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/errno.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/errno.h similarity index 96% rename from libs/pjproject-1.0/pjnath/include/pjnath/errno.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/errno.h index 80923c31d68e726f4e0e2f542f275be6cb4d964e..ffaa214ace315bc966927c245fc31bc974158645 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/errno.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/errno.h @@ -1,6 +1,7 @@ -/* $Id: errno.h 2031 2008-06-19 13:54:21Z bennylp $ */ +/* $Id: errno.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C)2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/ice_session.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/ice_session.h similarity index 99% rename from libs/pjproject-1.0/pjnath/include/pjnath/ice_session.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/ice_session.h index c8528cf33642e36f22148e5e2b1d34edd87b715d..c0670dc97a2e2e01f4e86030e43cf5d897311a5b 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/ice_session.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/ice_session.h @@ -1,6 +1,7 @@ -/* $Id: ice_session.h 2031 2008-06-19 13:54:21Z bennylp $ */ +/* $Id: ice_session.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/ice_strans.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/ice_strans.h similarity index 99% rename from libs/pjproject-1.0/pjnath/include/pjnath/ice_strans.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/ice_strans.h index 303f6eb084cf63bcbf204fa6054d8ffc5ad4fbe9..90cf55a5fce59b662c85c0579091c3b92419c379 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/ice_strans.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/ice_strans.h @@ -1,6 +1,7 @@ -/* $Id: ice_strans.h 2031 2008-06-19 13:54:21Z bennylp $ */ +/* $Id: ice_strans.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/nat_detect.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/nat_detect.h similarity index 97% rename from libs/pjproject-1.0/pjnath/include/pjnath/nat_detect.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/nat_detect.h index a0bd88104c200ba1a9ad751433a89ac3a55ae2d7..c72777aef4d98065ff1119e69277f683aa191476 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/nat_detect.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/nat_detect.h @@ -1,6 +1,7 @@ -/* $Id: nat_detect.h 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: nat_detect.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/stun_auth.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_auth.h similarity index 98% rename from libs/pjproject-1.0/pjnath/include/pjnath/stun_auth.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/stun_auth.h index f3c997dda9adc8f21be1a544994d7d1f34f0d668..2df70ed2032d065a272bcede9ec0ed2170423461 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/stun_auth.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_auth.h @@ -1,6 +1,7 @@ -/* $Id: stun_auth.h 1877 2008-03-19 23:00:30Z bennylp $ */ +/* $Id: stun_auth.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/stun_config.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_config.h similarity index 93% rename from libs/pjproject-1.0/pjnath/include/pjnath/stun_config.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/stun_config.h index 183d3571cfe0da5c9593f90bf3126c8462076875..1f5b00a4214117b4628f45312897bc33a99c2cd8 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/stun_config.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_config.h @@ -1,6 +1,7 @@ -/* $Id: stun_config.h 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: stun_config.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/stun_msg.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_msg.h similarity index 99% rename from libs/pjproject-1.0/pjnath/include/pjnath/stun_msg.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/stun_msg.h index c8438848d8dc20d5d870800e4e79a170b5a7ebcb..6d552647cac99fb7cd1bfeab8e020e6092405dbc 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/stun_msg.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_msg.h @@ -1,6 +1,7 @@ -/* $Id: stun_msg.h 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: stun_msg.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/stun_session.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_session.h similarity index 98% rename from libs/pjproject-1.0/pjnath/include/pjnath/stun_session.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/stun_session.h index ef79a8c52f2bd40d0af04dcd27ba12775d3253f7..3e75c29334d64a4089d00f8fe9fed289bf4a5d19 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/stun_session.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_session.h @@ -1,6 +1,7 @@ -/* $Id: stun_session.h 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: stun_session.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -231,7 +232,7 @@ struct pj_stun_tx_data void *pkt; /**< The STUN packet. */ unsigned max_len; /**< Length of packet buffer. */ - unsigned pkt_size; /**< The actual length of STUN pkt. */ + pj_size_t pkt_size; /**< The actual length of STUN pkt. */ unsigned addr_len; /**< Length of destination address. */ const pj_sockaddr_t *dst_addr; /**< Destination address. */ @@ -598,7 +599,7 @@ PJ_DECL(pj_status_t) pj_stun_session_on_rx_pkt(pj_stun_session *sess, pj_size_t pkt_size, unsigned options, void *token, - unsigned *parsed_len, + pj_size_t *parsed_len, const pj_sockaddr_t *src_addr, unsigned src_addr_len); diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/stun_sock.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_sock.h similarity index 98% rename from libs/pjproject-1.0/pjnath/include/pjnath/stun_sock.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/stun_sock.h index adad5cafea67f3d2d3deb28e34a9e42e8e2d931b..97c273be0a2f797b2f4977c6e28c6640afa310f5 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/stun_sock.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_sock.h @@ -1,6 +1,7 @@ -/* $Id: stun_sock.h 2037 2008-06-20 21:39:02Z bennylp $ */ +/* $Id: stun_sock.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/stun_transaction.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_transaction.h similarity index 97% rename from libs/pjproject-1.0/pjnath/include/pjnath/stun_transaction.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/stun_transaction.h index 7ece92b434f4442bd9a3bc1a56d2d1596b899b75..50d8c10e770a9b700b8dd622c1469361cd90af83 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/stun_transaction.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_transaction.h @@ -1,6 +1,7 @@ -/* $Id: stun_transaction.h 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: stun_transaction.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/turn_session.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/turn_session.h similarity index 98% rename from libs/pjproject-1.0/pjnath/include/pjnath/turn_session.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/turn_session.h index 76792211f40b641bf3144e4d52ff7cc116383de8..aed30c4c2b133e727ce2b4e9cbc216dc8cead649 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/turn_session.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/turn_session.h @@ -1,6 +1,7 @@ -/* $Id: turn_session.h 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: turn_session.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -592,8 +593,8 @@ PJ_DECL(pj_status_t) pj_turn_session_bind_channel(pj_turn_session *sess, */ PJ_DECL(pj_status_t) pj_turn_session_on_rx_pkt(pj_turn_session *sess, void *pkt, - unsigned pkt_len, - unsigned *parsed_len); + pj_size_t pkt_len, + pj_size_t *parsed_len); /** diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/turn_sock.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/turn_sock.h similarity index 98% rename from libs/pjproject-1.0/pjnath/include/pjnath/turn_sock.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/turn_sock.h index 8c13c938c602d8748476d29595629bde2ecab047..fba353d676e0c4a407d583e111d33670e260ff5f 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/turn_sock.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/turn_sock.h @@ -1,6 +1,7 @@ -/* $Id: turn_sock.h 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: turn_sock.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/include/pjnath/types.h b/libs/pjproject-1.0.1/pjnath/include/pjnath/types.h similarity index 97% rename from libs/pjproject-1.0/pjnath/include/pjnath/types.h rename to libs/pjproject-1.0.1/pjnath/include/pjnath/types.h index 00d6b6f226fd1626aeb3f45d6e3bdc4b07526ee8..49acccbace5b2a4416b2779a0b379408306f971c 100644 --- a/libs/pjproject-1.0/pjnath/include/pjnath/types.h +++ b/libs/pjproject-1.0.1/pjnath/include/pjnath/types.h @@ -1,6 +1,7 @@ -/* $Id: types.h 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: types.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath-test/ice_test.c b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/ice_test.c similarity index 99% rename from libs/pjproject-1.0/pjnath/src/pjnath-test/ice_test.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath-test/ice_test.c index 64f36e8aafa9e84e0722189e69247558f93981ce..01d95c28aec37448e06e9d64c0d2275270235ed9 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath-test/ice_test.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/ice_test.c @@ -1,6 +1,7 @@ -/* $Id: ice_test.c 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: ice_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath-test/main.c b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/main.c similarity index 88% rename from libs/pjproject-1.0/pjnath/src/pjnath-test/main.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath-test/main.c index a593d977fd9d72ede83176dabb88fdb054bbf6c6..3d1c2ccb7c7bdc3776fe688f13d12a4ef4882d09 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath-test/main.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/main.c @@ -1,6 +1,7 @@ -/* $Id: main.c 1095 2007-03-22 11:59:03Z bennylp $ */ +/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath-test/main_win32.c b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/main_win32.c similarity index 100% rename from libs/pjproject-1.0/pjnath/src/pjnath-test/main_win32.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath-test/main_win32.c diff --git a/libs/pjproject-1.0/pjnath/src/pjnath-test/server.c b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/server.c similarity index 99% rename from libs/pjproject-1.0/pjnath/src/pjnath-test/server.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath-test/server.c index 398d5abb1a71c46d024b64d0ef1078ced135d442..ce058755c5e109db7a1578f343950cfef43ca689 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath-test/server.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/server.c @@ -1,6 +1,7 @@ -/* $Id: server.c 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: server.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath-test/server.h b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/server.h similarity index 93% rename from libs/pjproject-1.0/pjnath/src/pjnath-test/server.h rename to libs/pjproject-1.0.1/pjnath/src/pjnath-test/server.h index 93df8ef46eca579ebe62fcc7eef2ad75cc0f4558..42c5ea5200169816b28acff947669553a1f7a4a7 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath-test/server.h +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/server.h @@ -1,6 +1,7 @@ -/* $Id: server.h 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: server.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath-test/sess_auth.c b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/sess_auth.c similarity index 99% rename from libs/pjproject-1.0/pjnath/src/pjnath-test/sess_auth.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath-test/sess_auth.c index 832476369aa194754fb8620ade6967e853be1bf2..93ad162393301ae938fd7d48162fefa357bedbb4 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath-test/sess_auth.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/sess_auth.c @@ -1,6 +1,7 @@ -/* $Id: sess_auth.c 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: sess_auth.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath-test/stun.c b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/stun.c similarity index 98% rename from libs/pjproject-1.0/pjnath/src/pjnath-test/stun.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath-test/stun.c index 88b773b09ab49652f1b652a494ceeee62602268f..380882a3bba0d7e7bd1659b45ba838269268e7c2 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath-test/stun.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/stun.c @@ -1,6 +1,7 @@ -/* $Id: stun.c 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: stun.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -242,7 +243,7 @@ static int decode_test(void) pj_stun_msg *msg, *msg2; pj_uint8_t buf[1500]; pj_str_t key; - unsigned len; + pj_size_t len; pj_status_t status; PJ_LOG(3,(THIS_FILE, " %s", t->title)); @@ -543,8 +544,9 @@ static int fingerprint_test_vector() for (i=0; i + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath-test/test.c b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/test.c similarity index 96% rename from libs/pjproject-1.0/pjnath/src/pjnath-test/test.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath-test/test.c index c21be05e652e260bb4ad3df9e4f71d6d83434483..cfc3548d256badc2739daa8225f82cde14f8b037 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath-test/test.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/test.c @@ -1,6 +1,7 @@ -/* $Id: test.c 2338 2008-10-01 09:58:42Z bennylp $ */ +/* $Id: test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath-test/test.h b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/test.h similarity index 91% rename from libs/pjproject-1.0/pjnath/src/pjnath-test/test.h rename to libs/pjproject-1.0.1/pjnath/src/pjnath-test/test.h index d80539f8be4a3ab28ff37bd3711c7ad83283b38d..db91b67753f2e9606a2d24b64d11a83fc66fa80d 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath-test/test.h +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/test.h @@ -1,6 +1,7 @@ -/* $Id: test.h 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: test.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath-test/turn_sock_test.c b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/turn_sock_test.c similarity index 98% rename from libs/pjproject-1.0/pjnath/src/pjnath-test/turn_sock_test.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath-test/turn_sock_test.c index 288f44a784a951def3cb2748a15ea962852ee6ef..f89a4f4b03c26f77c2efa66aea373251fa340547 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath-test/turn_sock_test.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath-test/turn_sock_test.c @@ -1,6 +1,7 @@ -/* $Id: turn_sock_test.c 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: turn_sock_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/errno.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/errno.c similarity index 97% rename from libs/pjproject-1.0/pjnath/src/pjnath/errno.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/errno.c index a840df7af7d3df03ccf420942f97de0e9cc9c0b8..7763c832b542179ce40843b1c3d89c40402702f2 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/errno.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/errno.c @@ -1,6 +1,7 @@ -/* $Id: errno.c 2031 2008-06-19 13:54:21Z bennylp $ */ +/* $Id: errno.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/ice_session.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/ice_session.c similarity index 99% rename from libs/pjproject-1.0/pjnath/src/pjnath/ice_session.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/ice_session.c index e77f8a56abd01975c4441d61b69ac843417b5d8c..f0f6d9d851bf71e4859e5e0ba109c01917b9ea21 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/ice_session.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/ice_session.c @@ -1,6 +1,7 @@ -/* $Id: ice_session.c 2206 2008-08-12 12:20:21Z bennylp $ */ +/* $Id: ice_session.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/ice_strans.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/ice_strans.c similarity index 99% rename from libs/pjproject-1.0/pjnath/src/pjnath/ice_strans.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/ice_strans.c index fb7b33287b387e35bfbd4a584927903eca658b7f..f640ab51b102f0ca2aaaead6e8c6533a0a5638b9 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/ice_strans.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/ice_strans.c @@ -1,6 +1,7 @@ -/* $Id: ice_strans.c 2258 2008-09-02 07:40:34Z bennylp $ */ +/* $Id: ice_strans.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/nat_detect.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/nat_detect.c similarity index 99% rename from libs/pjproject-1.0/pjnath/src/pjnath/nat_detect.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/nat_detect.c index 514106a93c6b8f0039b4043b1eec81a324f29832..bee2ffeaec1a063f373c4c6f03cdedc9d06ea4da 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/nat_detect.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/nat_detect.c @@ -1,6 +1,7 @@ -/* $Id: nat_detect.c 1936 2008-04-22 18:32:16Z bennylp $ */ +/* $Id: nat_detect.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/stun_auth.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_auth.c similarity index 99% rename from libs/pjproject-1.0/pjnath/src/pjnath/stun_auth.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/stun_auth.c index cc5640cdfef482316e945d8aa6108d04855903b7..aea40155b5ac664312e9ef212bcf7facb89258aa 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/stun_auth.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_auth.c @@ -1,6 +1,7 @@ -/* $Id: stun_auth.c 1877 2008-03-19 23:00:30Z bennylp $ */ +/* $Id: stun_auth.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/stun_msg.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_msg.c similarity index 99% rename from libs/pjproject-1.0/pjnath/src/pjnath/stun_msg.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/stun_msg.c index 64d69e3d0281fd3b1bd5a1c2d78a73857773812b..e1fa5aec4789c6b87848d146945b79dc7e1ebb7b 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/stun_msg.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_msg.c @@ -1,6 +1,7 @@ -/* $Id: stun_msg.c 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: stun_msg.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -2158,7 +2159,7 @@ PJ_DEF(pj_status_t) pj_stun_msg_decode(pj_pool_t *pool, if (adesc == NULL) { /* Unrecognized attribute */ - pj_stun_binary_attr *attr; + pj_stun_binary_attr *attr = NULL; PJ_LOG(5,(THIS_FILE, "Unrecognized attribute type 0x%x", attr_type)); diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/stun_msg_dump.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_msg_dump.c similarity index 97% rename from libs/pjproject-1.0/pjnath/src/pjnath/stun_msg_dump.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/stun_msg_dump.c index f5d7ec25be611832cb792cbd4169eb0b28f84106..50df8579b0f2a69d255092d83bff3c505272fcf9 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/stun_msg_dump.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_msg_dump.c @@ -1,6 +1,7 @@ -/* $Id: stun_msg_dump.c 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: stun_msg_dump.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/stun_session.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_session.c similarity index 99% rename from libs/pjproject-1.0/pjnath/src/pjnath/stun_session.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/stun_session.c index 0c3c8796cc91ecf3f2b000b20bfa46432e9d0fda..49a300e90e06658d5505cac8f252fa51b3162495 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/stun_session.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_session.c @@ -1,6 +1,7 @@ -/* $Id: stun_session.c 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: stun_session.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -1054,7 +1055,7 @@ static pj_status_t send_response(pj_stun_session *sess, void *token, const pj_sockaddr_t *addr, unsigned addr_len) { pj_uint8_t *out_pkt; - unsigned out_max_len, out_len; + pj_size_t out_max_len, out_len; pj_status_t status; /* Apply options */ @@ -1319,7 +1320,7 @@ PJ_DEF(pj_status_t) pj_stun_session_on_rx_pkt(pj_stun_session *sess, pj_size_t pkt_size, unsigned options, void *token, - unsigned *parsed_len, + pj_size_t *parsed_len, const pj_sockaddr_t *src_addr, unsigned src_addr_len) { diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/stun_sock.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_sock.c similarity index 98% rename from libs/pjproject-1.0/pjnath/src/pjnath/stun_sock.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/stun_sock.c index 5b2be5a9864034f66d718cce72ce7a18fe0e4faf..f87fe46aec7109d185e120d64b9723a81ecc36bf 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/stun_sock.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_sock.c @@ -1,6 +1,7 @@ -/* $Id: stun_sock.c 1988 2008-06-06 14:47:10Z bennylp $ */ +/* $Id: stun_sock.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -47,7 +48,7 @@ struct pj_stun_sock pj_sockaddr srv_addr; /* Resolved server addr */ pj_sockaddr mapped_addr; /* Our public address */ - pj_dns_async_query *q; /* Pending DNS query */ + pj_dns_srv_async_query *q; /* Pending DNS query */ pj_sock_t sock_fd; /* Socket descriptor */ pj_activesock_t *active_sock; /* Active socket object */ pj_ioqueue_op_key_t send_key; /* Default send key for app */ @@ -370,7 +371,7 @@ PJ_DEF(pj_status_t) pj_stun_sock_start( pj_stun_sock *stun_sock, PJ_DEF(pj_status_t) pj_stun_sock_destroy(pj_stun_sock *stun_sock) { if (stun_sock->q) { - pj_dns_resolver_cancel_query(stun_sock->q, PJ_FALSE); + pj_dns_srv_cancel_query(stun_sock->q, PJ_FALSE); stun_sock->q = NULL; } @@ -741,7 +742,7 @@ static pj_bool_t on_data_recvfrom(pj_activesock_t *asock, char errmsg[PJ_ERR_MSG_SIZE]; pj_strerror(status, errmsg, sizeof(errmsg)); - PJ_LOG(4,(stun_sock->obj_name, "recvfrom() error: %s", errmsg)); + PJ_LOG(2,(stun_sock->obj_name, "recvfrom() error: %s", errmsg)); return PJ_TRUE; } diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/stun_transaction.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_transaction.c similarity index 98% rename from libs/pjproject-1.0/pjnath/src/pjnath/stun_transaction.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/stun_transaction.c index a8be64bc7c4a3a625606302156a8a3272722994e..08a0eacf317b5486b6d66140fc762991cfb95cb0 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/stun_transaction.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_transaction.c @@ -1,6 +1,7 @@ -/* $Id: stun_transaction.c 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: stun_transaction.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/turn_session.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/turn_session.c similarity index 99% rename from libs/pjproject-1.0/pjnath/src/pjnath/turn_session.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/turn_session.c index 3da759d68c8e4593d84f533ab0f51c2fdeddeb5a..cc904dc9623f5449f084f9bd2a778e467a6b6099 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/turn_session.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/turn_session.c @@ -1,6 +1,7 @@ -/* $Id: turn_session.c 2340 2008-10-02 17:54:40Z bennylp $ */ +/* $Id: turn_session.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -86,7 +87,7 @@ struct pj_turn_session pj_timer_heap_t *timer_heap; pj_timer_entry timer; - pj_dns_async_query *dns_async; + pj_dns_srv_async_query *dns_async; pj_uint16_t default_port; pj_uint16_t af; @@ -342,7 +343,7 @@ static void sess_shutdown(pj_turn_session *sess, break; case PJ_TURN_STATE_RESOLVING: if (sess->dns_async != NULL) { - pj_dns_resolver_cancel_query(sess->dns_async, PJ_FALSE); + pj_dns_srv_cancel_query(sess->dns_async, PJ_FALSE); sess->dns_async = NULL; } break; @@ -914,8 +915,8 @@ on_return: */ PJ_DEF(pj_status_t) pj_turn_session_on_rx_pkt(pj_turn_session *sess, void *pkt, - unsigned pkt_len, - unsigned *parsed_len) + pj_size_t pkt_len, + pj_size_t *parsed_len) { pj_bool_t is_stun; pj_status_t status; diff --git a/libs/pjproject-1.0/pjnath/src/pjnath/turn_sock.c b/libs/pjproject-1.0.1/pjnath/src/pjnath/turn_sock.c similarity index 98% rename from libs/pjproject-1.0/pjnath/src/pjnath/turn_sock.c rename to libs/pjproject-1.0.1/pjnath/src/pjnath/turn_sock.c index ebbe0e130d823fd09fd9b0ea9e0704ee6da3fd03..6beb1f4bf9653b49352eae69d0ce47f8c37f683f 100644 --- a/libs/pjproject-1.0/pjnath/src/pjnath/turn_sock.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjnath/turn_sock.c @@ -1,6 +1,7 @@ -/* $Id: turn_sock.c 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: turn_sock.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -463,7 +464,7 @@ static pj_bool_t on_data_read(pj_activesock_t *asock, pj_size_t *remainder) { pj_turn_sock *turn_sock; - unsigned parsed_len; + pj_size_t parsed_len; pj_bool_t ret = PJ_TRUE; turn_sock = (pj_turn_sock*) pj_activesock_get_user_data(asock); diff --git a/libs/pjproject-1.0/pjnath/src/pjturn-client/client_main.c b/libs/pjproject-1.0.1/pjnath/src/pjturn-client/client_main.c similarity index 98% rename from libs/pjproject-1.0/pjnath/src/pjturn-client/client_main.c rename to libs/pjproject-1.0.1/pjnath/src/pjturn-client/client_main.c index c2e3b6ce6fe0c36a2e0be48d7f599c5232327c5e..94310ce750ef956343f44f84063c1f766d65e379 100644 --- a/libs/pjproject-1.0/pjnath/src/pjturn-client/client_main.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjturn-client/client_main.c @@ -1,6 +1,7 @@ -/* $Id: client_main.c 2340 2008-10-02 17:54:40Z bennylp $ */ +/* $Id: client_main.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjturn-srv/allocation.c b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/allocation.c similarity index 99% rename from libs/pjproject-1.0/pjnath/src/pjturn-srv/allocation.c rename to libs/pjproject-1.0.1/pjnath/src/pjturn-srv/allocation.c index 4c5fb63f0edff766c4474652479d017bd00aa525..ffd99935853bb95847d1db65e94d886801f804c2 100644 --- a/libs/pjproject-1.0/pjnath/src/pjturn-srv/allocation.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/allocation.c @@ -1,6 +1,7 @@ -/* $Id: allocation.c 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: allocation.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -934,7 +935,7 @@ PJ_DEF(void) pj_turn_allocation_on_rx_client_pkt(pj_turn_allocation *alloc, * with fingerprint checking. */ unsigned options = PJ_STUN_CHECK_PACKET | PJ_STUN_NO_FINGERPRINT_CHECK; - unsigned parsed_len = 0; + pj_size_t parsed_len = 0; if (pkt->transport->listener->tp_type == PJ_TURN_TP_UDP) options |= PJ_STUN_IS_DATAGRAM; diff --git a/libs/pjproject-1.0/pjnath/src/pjturn-srv/auth.c b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/auth.c similarity index 95% rename from libs/pjproject-1.0/pjnath/src/pjturn-srv/auth.c rename to libs/pjproject-1.0.1/pjnath/src/pjturn-srv/auth.c index f0c11cd7e83b953c844a2111e70486bd2a0d7ea0..286772ce0c32a9d22243623a1333166f7530a4f4 100644 --- a/libs/pjproject-1.0/pjnath/src/pjturn-srv/auth.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/auth.c @@ -1,6 +1,7 @@ -/* $Id: auth.c 1994 2008-06-06 23:10:37Z bennylp $ */ +/* $Id: auth.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjturn-srv/auth.h b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/auth.h similarity index 95% rename from libs/pjproject-1.0/pjnath/src/pjturn-srv/auth.h rename to libs/pjproject-1.0.1/pjnath/src/pjturn-srv/auth.h index ce00838e2c9311cf3060a1f795c1bd79390b58af..13416cfb79fc38a14200d58cad98a7e72b52d9b1 100644 --- a/libs/pjproject-1.0/pjnath/src/pjturn-srv/auth.h +++ b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/auth.h @@ -1,6 +1,7 @@ -/* $Id: auth.h 1882 2008-03-20 19:21:27Z bennylp $ */ +/* $Id: auth.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjturn-srv/listener_tcp.c b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/listener_tcp.c similarity index 98% rename from libs/pjproject-1.0/pjnath/src/pjturn-srv/listener_tcp.c rename to libs/pjproject-1.0.1/pjnath/src/pjturn-srv/listener_tcp.c index 5e5b5cdd0517f303be6248615dc029d2afe39fdb..20015a5ad4f9da8b4d28270cfd46e7e78607e98d 100644 --- a/libs/pjproject-1.0/pjnath/src/pjturn-srv/listener_tcp.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/listener_tcp.c @@ -1,6 +1,7 @@ -/* $Id: listener_tcp.c 2177 2008-07-25 10:45:34Z bennylp $ */ +/* $Id: listener_tcp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjturn-srv/listener_udp.c b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/listener_udp.c similarity index 97% rename from libs/pjproject-1.0/pjnath/src/pjturn-srv/listener_udp.c rename to libs/pjproject-1.0.1/pjnath/src/pjturn-srv/listener_udp.c index 12722800cfe4d89209e8810c437892cafbfd707e..89d6321073dbf03da92bdc406b8438c76acebd1d 100644 --- a/libs/pjproject-1.0/pjnath/src/pjturn-srv/listener_udp.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/listener_udp.c @@ -1,6 +1,7 @@ -/* $Id: listener_udp.c 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: listener_udp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjnath/src/pjturn-srv/main.c b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/main.c similarity index 93% rename from libs/pjproject-1.0/pjnath/src/pjturn-srv/main.c rename to libs/pjproject-1.0.1/pjnath/src/pjturn-srv/main.c index 3ae051862f0719978bf892c30ffd0d56214fcdd5..a302be82e3b449a08c13272acdefb98236f0e44f 100644 --- a/libs/pjproject-1.0/pjnath/src/pjturn-srv/main.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/main.c @@ -1,6 +1,7 @@ -/* $Id: main.c 2177 2008-07-25 10:45:34Z bennylp $ */ +/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -49,8 +50,8 @@ static void dump_status(pj_turn_srv *srv) } printf("Worker threads : %d\n", srv->core.thread_cnt); - printf("Total mem usage: %d.%03dMB\n", g_cp.used_size / 1000000, - (g_cp.used_size % 1000000)/1000); + printf("Total mem usage: %u.%03uMB\n", (unsigned)(g_cp.used_size / 1000000), + (unsigned)((g_cp.used_size % 1000000)/1000)); printf("UDP port range : %u %u %u (next/min/max)\n", srv->ports.next_udp, srv->ports.min_udp, srv->ports.max_udp); printf("TCP port range : %u %u %u (next/min/max)\n", srv->ports.next_tcp, diff --git a/libs/pjproject-1.0/pjnath/src/pjturn-srv/server.c b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/server.c similarity index 98% rename from libs/pjproject-1.0/pjnath/src/pjturn-srv/server.c rename to libs/pjproject-1.0.1/pjnath/src/pjturn-srv/server.c index 7ccc8829be70cafae729b7e99f8e3c53ed052a0d..5a6d62cc515f6837e0469303d5fe41e84aa74578 100644 --- a/libs/pjproject-1.0/pjnath/src/pjturn-srv/server.c +++ b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/server.c @@ -1,6 +1,7 @@ -/* $Id: server.c 2234 2008-08-22 17:46:33Z bennylp $ */ +/* $Id: server.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -615,7 +616,7 @@ PJ_DEF(void) pj_turn_srv_on_rx_pkt(pj_turn_srv *srv, } else { /* Otherwise this is a new client */ unsigned options; - unsigned parsed_len; + pj_size_t parsed_len; pj_status_t status; /* Check that this is a STUN message */ diff --git a/libs/pjproject-1.0/pjnath/src/pjturn-srv/turn.h b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/turn.h similarity index 98% rename from libs/pjproject-1.0/pjnath/src/pjturn-srv/turn.h rename to libs/pjproject-1.0.1/pjnath/src/pjturn-srv/turn.h index a5d5bf7480d73755f109a6690930a2610da6f84a..c4e021bd028f97161db3972bd6683093b988c4d8 100644 --- a/libs/pjproject-1.0/pjnath/src/pjturn-srv/turn.h +++ b/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/turn.h @@ -1,6 +1,7 @@ -/* $Id: turn.h 1913 2008-04-09 09:38:12Z bennylp $ */ +/* $Id: turn.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjproject-vs8.sln b/libs/pjproject-1.0.1/pjproject-vs8.sln similarity index 100% rename from libs/pjproject-1.0/pjproject-vs8.sln rename to libs/pjproject-1.0.1/pjproject-vs8.sln diff --git a/libs/pjproject-1.0/pjproject.dsw b/libs/pjproject-1.0.1/pjproject.dsw similarity index 100% rename from libs/pjproject-1.0/pjproject.dsw rename to libs/pjproject-1.0.1/pjproject.dsw diff --git a/libs/pjproject-1.0/pjsip-apps/build/Footprint.mak b/libs/pjproject-1.0.1/pjsip-apps/build/Footprint.mak similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/Footprint.mak rename to libs/pjproject-1.0.1/pjsip-apps/build/Footprint.mak diff --git a/libs/pjproject-1.0/pjsip-apps/build/Samples-vc.mak b/libs/pjproject-1.0.1/pjsip-apps/build/Samples-vc.mak similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/Samples-vc.mak rename to libs/pjproject-1.0.1/pjsip-apps/build/Samples-vc.mak diff --git a/libs/pjproject-1.0/pjsip-apps/build/Samples.mak b/libs/pjproject-1.0.1/pjsip-apps/build/Samples.mak similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/Samples.mak rename to libs/pjproject-1.0.1/pjsip-apps/build/Samples.mak diff --git a/libs/pjproject-1.0/pjsip-apps/build/get-footprint.py b/libs/pjproject-1.0.1/pjsip-apps/build/get-footprint.py similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/get-footprint.py rename to libs/pjproject-1.0.1/pjsip-apps/build/get-footprint.py diff --git a/libs/pjproject-1.0/pjsip-apps/build/os-win32.mak b/libs/pjproject-1.0.1/pjsip-apps/build/os-win32.mak similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/os-win32.mak rename to libs/pjproject-1.0.1/pjsip-apps/build/os-win32.mak diff --git a/libs/pjproject-1.0/pjsip-apps/build/pjsip_apps.dsw b/libs/pjproject-1.0.1/pjsip-apps/build/pjsip_apps.dsw similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/pjsip_apps.dsw rename to libs/pjproject-1.0.1/pjsip-apps/build/pjsip_apps.dsw diff --git a/libs/pjproject-1.0/pjsip-apps/build/pjsua.dsp b/libs/pjproject-1.0.1/pjsip-apps/build/pjsua.dsp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/pjsua.dsp rename to libs/pjproject-1.0.1/pjsip-apps/build/pjsua.dsp diff --git a/libs/pjproject-1.0/pjsip-apps/build/pjsua.vcproj b/libs/pjproject-1.0.1/pjsip-apps/build/pjsua.vcproj similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/pjsua.vcproj rename to libs/pjproject-1.0.1/pjsip-apps/build/pjsua.vcproj diff --git a/libs/pjproject-1.0/pjsip-apps/build/py_pjsua.dsp b/libs/pjproject-1.0.1/pjsip-apps/build/py_pjsua.dsp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/py_pjsua.dsp rename to libs/pjproject-1.0.1/pjsip-apps/build/py_pjsua.dsp diff --git a/libs/pjproject-1.0/pjsip-apps/build/py_pjsua.vcproj b/libs/pjproject-1.0.1/pjsip-apps/build/py_pjsua.vcproj similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/py_pjsua.vcproj rename to libs/pjproject-1.0.1/pjsip-apps/build/py_pjsua.vcproj diff --git a/libs/pjproject-1.0/pjsip-apps/build/python_pjsua.dsp b/libs/pjproject-1.0.1/pjsip-apps/build/python_pjsua.dsp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/python_pjsua.dsp rename to libs/pjproject-1.0.1/pjsip-apps/build/python_pjsua.dsp diff --git a/libs/pjproject-1.0/pjsip-apps/build/sample_debug.dsp b/libs/pjproject-1.0.1/pjsip-apps/build/sample_debug.dsp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/sample_debug.dsp rename to libs/pjproject-1.0.1/pjsip-apps/build/sample_debug.dsp diff --git a/libs/pjproject-1.0/pjsip-apps/build/sample_debug.vcproj b/libs/pjproject-1.0.1/pjsip-apps/build/sample_debug.vcproj similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/sample_debug.vcproj rename to libs/pjproject-1.0.1/pjsip-apps/build/sample_debug.vcproj diff --git a/libs/pjproject-1.0/pjsip-apps/build/samples.dsp b/libs/pjproject-1.0.1/pjsip-apps/build/samples.dsp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/samples.dsp rename to libs/pjproject-1.0.1/pjsip-apps/build/samples.dsp diff --git a/libs/pjproject-1.0/pjsip-apps/build/samples.vcproj b/libs/pjproject-1.0.1/pjsip-apps/build/samples.vcproj similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/samples.vcproj rename to libs/pjproject-1.0.1/pjsip-apps/build/samples.vcproj diff --git a/libs/pjproject-1.0/pjsip-apps/build/wince-evc4/wince_demos.vcw b/libs/pjproject-1.0.1/pjsip-apps/build/wince-evc4/wince_demos.vcw similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/build/wince-evc4/wince_demos.vcw rename to libs/pjproject-1.0.1/pjsip-apps/build/wince-evc4/wince_demos.vcw diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua/main.c b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/main.c similarity index 94% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua/main.c rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua/main.c index 780dff6665eccfd0cf7083047a1328562011aa01..da07c034fea63333e4fbc8009fd1b0056bb73873 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/pjsua/main.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/main.c @@ -1,5 +1,6 @@ -/* $Id: main.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua/main_rtems.c b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/main_rtems.c similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua/main_rtems.c rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua/main_rtems.c diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua/pjsua_app.c b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/pjsua_app.c similarity index 97% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua/pjsua_app.c rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua/pjsua_app.c index 08ae515533899fd17ba4ea20cc3bf9f8d0ab2c2c..f254d80111dcb7f1a4f39431a538a81b9cdd9ba5 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/pjsua/pjsua_app.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/pjsua_app.c @@ -1,5 +1,6 @@ -/* $Id: pjsua_app.c 2316 2008-09-24 16:52:41Z bennylp $ */ +/* $Id: pjsua_app.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -62,6 +63,7 @@ static struct app_config pj_bool_t use_tls; pjsua_transport_config udp_cfg; pjsua_transport_config rtp_cfg; + pjsip_redirect_op redir_op; unsigned acc_cnt; pjsua_acc_config acc_cfg[PJSUA_MAX_ACC]; @@ -176,6 +178,7 @@ static void usage(void) puts (" --registrar=url Set the URL of registrar server"); puts (" --id=url Set the URL of local ID (used in From header)"); puts (" --contact=url Optionally override the Contact information"); + puts (" --contact-params=S Append the specified parameters S in Contact URI"); puts (" --proxy=url Optional URL of proxy server to visit"); puts (" May be specified multiple times"); puts (" --reg-timeout=SEC Optional registration interval (default 55)"); @@ -278,6 +281,8 @@ static void usage(void) puts (" --norefersub Suppress event subscription when transfering calls"); puts (" --use-compact-form Minimize SIP message size"); puts (" --no-force-lr Allow strict-route to be used (i.e. do not force lr)"); + puts (" --accept-redirect=N Specify how to handle call redirect (3xx) response."); + puts (" 0: reject, 1: follow automatically (default), 2: ask"); puts (""); puts ("When URL is specified, pjsua will immediately initiate call to that URL"); @@ -303,6 +308,7 @@ static void default_config(struct app_config *cfg) cfg->udp_cfg.port = 5060; pjsua_transport_config_default(&cfg->rtp_cfg); cfg->rtp_cfg.port = 4000; + cfg->redir_op = PJSIP_REDIRECT_ACCEPT; cfg->duration = NO_LIMIT; cfg->wav_id = PJSUA_INVALID_ID; cfg->rec_id = PJSUA_INVALID_ID; @@ -458,6 +464,7 @@ static pj_status_t parse_args(int argc, char *argv[], OPT_HELP, OPT_VERSION, OPT_NULL_AUDIO, OPT_SND_AUTO_CLOSE, OPT_LOCAL_PORT, OPT_IP_ADDR, OPT_PROXY, OPT_OUTBOUND_PROXY, OPT_REGISTRAR, OPT_REG_TIMEOUT, OPT_PUBLISH, OPT_ID, OPT_CONTACT, + OPT_CONTACT_PARAMS, OPT_100REL, OPT_USE_IMS, OPT_REALM, OPT_USERNAME, OPT_PASSWORD, OPT_NAMESERVER, OPT_STUN_DOMAIN, OPT_STUN_SRV, OPT_ADD_BUDDY, OPT_OFFER_X_MS_MSG, OPT_NO_PRESENCE, @@ -472,7 +479,7 @@ static pj_status_t parse_args(int argc, char *argv[], OPT_RX_DROP_PCT, OPT_TX_DROP_PCT, OPT_EC_TAIL, OPT_EC_OPT, OPT_NEXT_ACCOUNT, OPT_NEXT_CRED, OPT_MAX_CALLS, OPT_DURATION, OPT_NO_TCP, OPT_NO_UDP, OPT_THREAD_CNT, - OPT_NOREFERSUB, + OPT_NOREFERSUB, OPT_ACCEPT_REDIRECT, OPT_USE_TLS, OPT_TLS_CA_FILE, OPT_TLS_CERT_FILE, OPT_TLS_PRIV_FILE, OPT_TLS_PASSWORD, OPT_TLS_VERIFY_SERVER, OPT_TLS_VERIFY_CLIENT, OPT_TLS_NEG_TIMEOUT, OPT_TLS_SRV_NAME, @@ -513,8 +520,10 @@ static pj_status_t parse_args(int argc, char *argv[], { "use-ims", 0, 0, OPT_USE_IMS}, { "id", 1, 0, OPT_ID}, { "contact", 1, 0, OPT_CONTACT}, + { "contact-params",1,0, OPT_CONTACT_PARAMS}, { "auto-update-nat", 1, 0, OPT_AUTO_UPDATE_NAT}, { "use-compact-form", 0, 0, OPT_USE_COMPACT_FORM}, + { "accept-redirect", 1, 0, OPT_ACCEPT_REDIRECT}, { "no-force-lr",0, 0, OPT_NO_FORCE_LR}, { "realm", 1, 0, OPT_REALM}, { "username", 1, 0, OPT_USERNAME}, @@ -821,6 +830,10 @@ static pj_status_t parse_args(int argc, char *argv[], cur_acc->force_contact = pj_str(pj_optarg); break; + case OPT_CONTACT_PARAMS: + cur_acc->contact_params = pj_str(pj_optarg); + break; + case OPT_AUTO_UPDATE_NAT: /* OPT_AUTO_UPDATE_NAT */ cur_acc->allow_contact_rewrite = pj_strtoul(pj_cstr(&tmp, pj_optarg)); break; @@ -840,6 +853,15 @@ static pj_status_t parse_args(int argc, char *argv[], } break; + case OPT_ACCEPT_REDIRECT: + cfg->redir_op = my_atoi(pj_optarg); + if (cfg->redir_op<0 || cfg->redir_op>PJSIP_REDIRECT_STOP) { + PJ_LOG(1,(THIS_FILE, + "Error: accept-redirect value '%s' ", pj_optarg)); + return PJ_EINVAL; + } + break; + case OPT_NO_FORCE_LR: cfg->cfg.force_lr = PJ_FALSE; break; @@ -1356,6 +1378,14 @@ static void write_account_settings(int acc_index, pj_str_t *result) pj_strcat2(result, line); } + /* Contact parameters */ + if (acc_cfg->contact_params.slen) { + pj_ansi_sprintf(line, "--contact-params %.*s\n", + (int)acc_cfg->contact_params.slen, + acc_cfg->contact_params.ptr); + pj_strcat2(result, line); + } + /* */ if (acc_cfg->allow_contact_rewrite!=1) { @@ -1785,6 +1815,13 @@ static int write_settings(const struct app_config *config, pj_strcat2(&cfg, line); } + /* accept-redirect */ + if (config->redir_op != PJSIP_REDIRECT_ACCEPT) { + pj_ansi_sprintf(line, "--accept-redirect %d\n", + config->redir_op); + pj_strcat2(&cfg, line); + } + /* Max calls. */ pj_ansi_sprintf(line, "--max-calls %d\n", config->cfg.max_calls); @@ -1840,7 +1877,8 @@ static void app_dump(pj_bool_t detail) * printing it is a bit tricky, it should be printed part by part as long * as the logger can accept. */ -static void log_call_dump(int call_id) { +static void log_call_dump(int call_id) +{ unsigned call_dump_len; unsigned part_len; unsigned part_idx; @@ -2150,6 +2188,9 @@ static void on_incoming_call(pjsua_acc_id acc_id, pjsua_call_id call_id, /* Start ringback */ ring_start(call_id); + if (current_call==PJSUA_INVALID_ID) + current_call = call_id; + if (app_config.auto_answer > 0) { pjsua_call_answer(call_id, app_config.auto_answer, NULL, NULL); } @@ -2368,6 +2409,34 @@ static void call_on_dtmf_callback(pjsua_call_id call_id, int dtmf) PJ_LOG(3,(THIS_FILE, "Incoming DTMF on call %d: %c", call_id, dtmf)); } +/* + * Redirection handler. + */ +static pjsip_redirect_op call_on_redirected(pjsua_call_id call_id, + const pjsip_uri *target, + const pjsip_event *e) +{ + PJ_UNUSED_ARG(e); + + if (app_config.redir_op == PJSIP_REDIRECT_PENDING) { + char uristr[PJSIP_MAX_URL_SIZE]; + int len; + + len = pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, target, uristr, + sizeof(uristr)); + if (len < 1) { + pj_ansi_strcpy(uristr, "--URI too long--"); + } + + PJ_LOG(3,(THIS_FILE, "Call %d is being redirected to %.*s. " + "Press 'Ra' to accept, 'Rr' to reject, or 'Rd' to " + "disconnect.", + call_id, len, uristr)); + } + + return app_config.redir_op; +} + /* * Handler registration status has changed. */ @@ -3915,6 +3984,21 @@ void console_app_main(const pj_str_t *uri_to_call) goto on_exit; + case 'R': + if (!pjsua_call_is_active(current_call)) { + PJ_LOG(1,(THIS_FILE, "Call %d has gone", current_call)); + } else if (menuin[1] == 'a') { + pjsua_call_process_redirect(current_call, + PJSIP_REDIRECT_ACCEPT); + } else if (menuin[1] == 'r') { + pjsua_call_process_redirect(current_call, + PJSIP_REDIRECT_REJECT); + } else { + pjsua_call_process_redirect(current_call, + PJSIP_REDIRECT_STOP); + } + break; + default: if (menuin[0] != '\n' && menuin[0] != '\r') { printf("Invalid input %s", menuin); @@ -3962,6 +4046,7 @@ pj_status_t app_init(int argc, char *argv[]) app_config.cfg.cb.on_incoming_call = &on_incoming_call; app_config.cfg.cb.on_call_tsx_state = &on_call_tsx_state; app_config.cfg.cb.on_dtmf_digit = &call_on_dtmf_callback; + app_config.cfg.cb.on_call_redirected = &call_on_redirected; app_config.cfg.cb.on_reg_state = &on_reg_state; app_config.cfg.cb.on_incoming_subscribe = &on_incoming_subscribe; app_config.cfg.cb.on_buddy_state = &on_buddy_state; diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/README.TXT similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/README.TXT diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/StdAfx.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/StdAfx.cpp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/StdAfx.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/StdAfx.cpp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/StdAfx.h b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/StdAfx.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/StdAfx.h rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/StdAfx.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/newres.h b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/newres.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/newres.h rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/newres.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/pjsua_wince.h b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/pjsua_wince.h rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/pjsua_wince.ico b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.ico similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/pjsua_wince.ico rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.ico diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/pjsua_wince.rc b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.rc similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/pjsua_wince.rc rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.rc diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/resource.h b/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/resource.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pjsua_wince/resource.h rename to libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/resource.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.cpp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.cpp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.h b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.h rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.rc b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.rc similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.rc rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.rc diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.vcc b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcc similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.vcc rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcc diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.vcp b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.vcp rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.vcw b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcw similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJ.vcw rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcw diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJDlg.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJDlg.cpp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJDlg.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJDlg.cpp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJDlg.h b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJDlg.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/PocketPJDlg.h rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJDlg.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/PopUpWnd.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PopUpWnd.cpp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/PopUpWnd.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PopUpWnd.cpp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/PopUpWnd.h b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PopUpWnd.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/PopUpWnd.h rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PopUpWnd.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/ReadMe.txt b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/ReadMe.txt similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/ReadMe.txt rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/ReadMe.txt diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/SettingsDlg.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/SettingsDlg.cpp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/SettingsDlg.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/SettingsDlg.cpp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/SettingsDlg.h b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/SettingsDlg.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/SettingsDlg.h rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/SettingsDlg.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/StdAfx.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/StdAfx.cpp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/StdAfx.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/StdAfx.cpp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/StdAfx.h b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/StdAfx.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/StdAfx.h rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/StdAfx.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/newres.h b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/newres.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/newres.h rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/newres.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/PocketPJ.ico b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/PocketPJ.ico similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/PocketPJ.ico rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/PocketPJ.ico diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/action.bmp b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/action.bmp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/action.bmp rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/action.bmp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/blank.bmp b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/blank.bmp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/blank.bmp rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/blank.bmp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/invisibl.bmp b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/invisibl.bmp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/invisibl.bmp rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/invisibl.bmp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/invisibl.ico b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/invisibl.ico similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/invisibl.ico rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/invisibl.ico diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/offline.bmp b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/offline.bmp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/offline.bmp rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/offline.bmp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/offline.ico b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/offline.ico similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/offline.ico rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/offline.ico diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/online.bmp b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/online.bmp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/online.bmp rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/online.bmp diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/online.ico b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/online.ico similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/res/online.ico rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/online.ico diff --git a/libs/pjproject-1.0/pjsip-apps/src/pocketpj/resource.h b/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/resource.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/pocketpj/resource.h rename to libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/resource.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/py_pjsua/DEPRECATED.txt b/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/DEPRECATED.txt similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/py_pjsua/DEPRECATED.txt rename to libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/DEPRECATED.txt diff --git a/libs/pjproject-1.0/pjsip-apps/src/py_pjsua/helper.mak b/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/helper.mak similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/py_pjsua/helper.mak rename to libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/helper.mak diff --git a/libs/pjproject-1.0/pjsip-apps/src/py_pjsua/pjsua.py b/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/pjsua.py similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/py_pjsua/pjsua.py rename to libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/pjsua.py diff --git a/libs/pjproject-1.0/pjsip-apps/src/py_pjsua/pjsua_app.py b/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/pjsua_app.py similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/py_pjsua/pjsua_app.py rename to libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/pjsua_app.py diff --git a/libs/pjproject-1.0/pjsip-apps/src/py_pjsua/py_pjsua.c b/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.c similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/py_pjsua/py_pjsua.c rename to libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.c index 9e8e22541bb59de874d843508bda71d9ee3c51c0..3238b95546eb2e60aac69e1f7c16bce6e5430d3b 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/py_pjsua/py_pjsua.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.c @@ -1,5 +1,6 @@ -/* $Id: py_pjsua.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: py_pjsua.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/py_pjsua/py_pjsua.def b/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.def similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/py_pjsua/py_pjsua.def rename to libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.def diff --git a/libs/pjproject-1.0/pjsip-apps/src/py_pjsua/py_pjsua.h b/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.h similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/py_pjsua/py_pjsua.h rename to libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.h index 21a19d02b338b300b4d1a2f326a753a40340adca..a68206a3bdc08a3d45e84153496161449f1dd22b 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/py_pjsua/py_pjsua.h +++ b/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.h @@ -1,5 +1,6 @@ -/* $Id: py_pjsua.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: py_pjsua.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/py_pjsua/setup.py b/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/setup.py similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/py_pjsua/setup.py rename to libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/setup.py diff --git a/libs/pjproject-1.0/pjsip-apps/src/python/_pjsua.c b/libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.c similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/python/_pjsua.c rename to libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.c index 74cbb2892ceec690f6553d8f83518abb41e295e0..0eb7e8009c7538afd587d4bd6e08e8ffc945ed71 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/python/_pjsua.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.c @@ -1,5 +1,6 @@ -/* $Id: _pjsua.c 2260 2008-09-04 07:37:30Z bennylp $ */ +/* $Id: _pjsua.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -2137,6 +2138,8 @@ static PyObject *py_pjsua_im_send(PyObject *pSelf, PyObject *pArgs) to = PyString_ToPJ(pTo); content = PyString_ToPJ(pContent); + pjsua_msg_data_init(&msg_data); + if (pMsgData != Py_None) { PyObj_pjsua_msg_data *omd; @@ -2179,6 +2182,8 @@ static PyObject *py_pjsua_im_typing(PyObject *pSelf, PyObject *pArgs) to = PyString_ToPJ(pTo); + pjsua_msg_data_init(&msg_data); + if (pMsgData != Py_None) { PyObj_pjsua_msg_data *omd; diff --git a/libs/pjproject-1.0/pjsip-apps/src/python/_pjsua.def b/libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.def similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/python/_pjsua.def rename to libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.def diff --git a/libs/pjproject-1.0/pjsip-apps/src/python/_pjsua.h b/libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.h similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/python/_pjsua.h rename to libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.h index bb81de95777b68369b80098dea39367ec5c077a2..9feacec7fa976029d82de148c091ebcc323dff63 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/python/_pjsua.h +++ b/libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.h @@ -1,5 +1,6 @@ -/* $Id: _pjsua.h 2260 2008-09-04 07:37:30Z bennylp $ */ +/* $Id: _pjsua.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/python/helper.mak b/libs/pjproject-1.0.1/pjsip-apps/src/python/helper.mak similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/python/helper.mak rename to libs/pjproject-1.0.1/pjsip-apps/src/python/helper.mak diff --git a/libs/pjproject-1.0/pjsip-apps/src/python/pjsua.py b/libs/pjproject-1.0.1/pjsip-apps/src/python/pjsua.py similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/python/pjsua.py rename to libs/pjproject-1.0.1/pjsip-apps/src/python/pjsua.py index c702dd3706728a781a5636363bfb550569b89cc1..f653fc06e3112aa73913d39870a1705088ad1d7e 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/python/pjsua.py +++ b/libs/pjproject-1.0.1/pjsip-apps/src/python/pjsua.py @@ -1,4 +1,4 @@ -# $Id: pjsua.py 2221 2008-08-18 11:32:13Z bennylp $ +# $Id: pjsua.py 2375 2008-12-11 11:18:33Z bennylp $ # # Object oriented PJSUA wrapper. # @@ -1672,7 +1672,28 @@ class Call: err = _pjsua.call_send_request(self._id, method, msg_data) self._lib()._err_check("send_request()", self, err) + def send_pager(self, text, im_id=0, content_type="text/plain", + hdr_list=None): + """Send instant message inside a call. + Keyword arguments: + text -- Instant message to be sent + im_id -- Optional instant message ID to identify this + instant message when delivery status callback + is called. + content_type -- MIME type identifying the instant message + hdr_list -- Optional list of headers to be sent with the + request. + + """ + lck = self._lib().auto_lock() + err = _pjsua.call_send_im(self._id, \ + content_type, text, \ + Lib._create_msg_data(hdr_list), \ + im_id) + self._lib()._err_check("send_pager()", self, err) + + class BuddyInfo: """This class contains information about Buddy. Application may retrieve this information by calling Buddy.info(). @@ -2084,7 +2105,7 @@ class Lib: while self._quit != 2 and loop < 400: self.handle_events(5) loop = loop + 1 - time.sleep(0.050) + time.sleep(0.050) _pjsua.destroy() _lib = None @@ -2116,6 +2137,20 @@ class Lib: lck = self.auto_lock() return _pjsua.handle_events(timeout) + def thread_register(self, name): + """Register external threads (threads that are not created by PJSIP, + such as threads that are created by Python API) to PJSIP. + + The call must be made from the new thread before calling any pjlib + functions. + + Keyword arguments: + name -- Non descriptive name for the thread + """ + dummy = 1 + err = _pjsua.thread_register(name, dummy) + self._err_check("thread_register()", self, err) + def verify_sip_url(self, sip_url): """Verify that the specified string is a valid URI. @@ -2664,7 +2699,7 @@ class Lib: def _cb_on_pager(self, call_id, from_uri, to_uri, contact, mime_type, body, acc_id): call = None - if call_id == -1: + if call_id != -1: call = self._lookup_call(call_id) if call: call._cb.on_pager(mime_type, body) @@ -2679,7 +2714,7 @@ class Lib: def _cb_on_pager_status(self, call_id, to_uri, body, user_data, code, reason, acc_id): call = None - if call_id == -1: + if call_id != -1: call = self._lookup_call(call_id) if call: call._cb.on_pager_status(body, user_data, code, reason) @@ -2694,7 +2729,7 @@ class Lib: def _cb_on_typing(self, call_id, from_uri, to_uri, contact, is_typing, acc_id): call = None - if call_id == -1: + if call_id != -1: call = self._lookup_call(call_id) if call: call._cb.on_typing(is_typing) @@ -2711,9 +2746,6 @@ class Lib: if buddy: buddy._cb.on_state() - - - # # Internal # diff --git a/libs/pjproject-1.0/pjsip-apps/src/python/samples/call.py b/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/call.py similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/python/samples/call.py rename to libs/pjproject-1.0.1/pjsip-apps/src/python/samples/call.py diff --git a/libs/pjproject-1.0/pjsip-apps/src/python/samples/presence.py b/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/presence.py similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/python/samples/presence.py rename to libs/pjproject-1.0.1/pjsip-apps/src/python/samples/presence.py diff --git a/libs/pjproject-1.0/pjsip-apps/src/python/samples/registration.py b/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/registration.py similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/python/samples/registration.py rename to libs/pjproject-1.0.1/pjsip-apps/src/python/samples/registration.py diff --git a/libs/pjproject-1.0/pjsip-apps/src/python/samples/simplecall.py b/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/simplecall.py similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/python/samples/simplecall.py rename to libs/pjproject-1.0.1/pjsip-apps/src/python/samples/simplecall.py diff --git a/libs/pjproject-1.0/pjsip-apps/src/python/setup-vc.py b/libs/pjproject-1.0.1/pjsip-apps/src/python/setup-vc.py similarity index 97% rename from libs/pjproject-1.0/pjsip-apps/src/python/setup-vc.py rename to libs/pjproject-1.0.1/pjsip-apps/src/python/setup-vc.py index ab2c3ebc4edfc17ab36e1275851bbbcfab508648..a616e325f90a61c8f3011a0d58182839087f65d1 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/python/setup-vc.py +++ b/libs/pjproject-1.0.1/pjsip-apps/src/python/setup-vc.py @@ -1,4 +1,4 @@ -# $Id: setup-vc.py 2173 2008-07-24 12:20:53Z bennylp $ +# $Id: setup-vc.py 2394 2008-12-23 17:27:53Z bennylp $ # # pjsua Setup script for Visual Studio # diff --git a/libs/pjproject-1.0/pjsip-apps/src/python/setup.py b/libs/pjproject-1.0.1/pjsip-apps/src/python/setup.py similarity index 97% rename from libs/pjproject-1.0/pjsip-apps/src/python/setup.py rename to libs/pjproject-1.0.1/pjsip-apps/src/python/setup.py index fc3119fc29c9cd6c428c77c2acfa7b8bbcdae310..53ece90c0a73bd47bfd4a99310be120f1fde324e 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/python/setup.py +++ b/libs/pjproject-1.0.1/pjsip-apps/src/python/setup.py @@ -1,4 +1,4 @@ -# $Id: setup.py 2172 2008-07-24 12:20:08Z bennylp $ +# $Id: setup.py 2394 2008-12-23 17:27:53Z bennylp $ # # pjsua Setup script. # diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/aectest.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/aectest.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/aectest.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/aectest.c index dd55a83d8365edc7bd7fd05e1318aff54fd0d06a..969420a70d5a4cd6d8fcdcc03abc237bb84caa3d 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/aectest.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/aectest.c @@ -1,5 +1,6 @@ -/* $Id: aectest.c 2210 2008-08-13 13:53:18Z bennylp $ */ +/* $Id: aectest.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/confbench.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/confbench.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/confbench.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/confbench.c index 40d1bb443da6941d55a54921ab149ea07f0e7aab..1564b90a1c4b877264ccd9ebc8e3fe0bda2eb96b 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/confbench.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/confbench.c @@ -1,5 +1,6 @@ -/* $Id: confbench.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: confbench.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/confsample.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/confsample.c similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/samples/confsample.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/confsample.c index 6a28fb362a92921e22b87f5fff0e9023079b0fef..e5f79fc5ac2c38989cec96ed03da27a6918bbcb2 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/confsample.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/confsample.c @@ -1,5 +1,6 @@ -/* $Id: confsample.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: confsample.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/debug.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/debug.c similarity index 89% rename from libs/pjproject-1.0/pjsip-apps/src/samples/debug.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/debug.c index 16010e9ae1615172e61ac46e1040eb038aebe21a..8973c118ed6d28e3554f4cd2f0f609c1b6339163 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/debug.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/debug.c @@ -1,5 +1,6 @@ -/* $Id: debug.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: debug.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/encdec.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/encdec.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/encdec.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/encdec.c index b2f30deab39df1f8ad9e9ec4e9b7113769218552..70326a0f57ff559df9ab159584e8e90d622db9e3 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/encdec.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/encdec.c @@ -1,5 +1,6 @@ -/* $Id: encdec.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: encdec.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/footprint.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/footprint.c similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/samples/footprint.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/footprint.c index f158035b6d0eb259a59f5412200aa57bd0a79e1f..f589c1592ce78461d62abd694c3b925e2204e975 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/footprint.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/footprint.c @@ -1,5 +1,6 @@ -/* $Id: footprint.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: footprint.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/invtester.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/invtester.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/invtester.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/invtester.c index 462514ce13e354b6600f75604d14abbaa61094ea..dc7ce8b44fcdd7ef92d5ca52387fab93c9726cdd 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/invtester.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/invtester.c @@ -1,5 +1,6 @@ -/* $Id: invtester.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: invtester.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/latency.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/latency.c similarity index 97% rename from libs/pjproject-1.0/pjsip-apps/src/samples/latency.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/latency.c index 298abb4a13696057879246c2b508f9c890c29dfb..7c849f2899baf87e79b3e9523e2caca9ffb67311 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/latency.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/latency.c @@ -1,5 +1,6 @@ -/* $Id: latency.c 2178 2008-07-28 14:37:47Z bennylp $ */ +/* $Id: latency.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/level.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/level.c similarity index 86% rename from libs/pjproject-1.0/pjsip-apps/src/samples/level.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/level.c index 667bc0d157d5d7d33176bd712e495d9f124d36b8..fa2e385a286cc3426bc8d963acf921c9c462095b 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/level.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/level.c @@ -1,5 +1,6 @@ -/* $Id: level.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: level.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -72,7 +73,7 @@ static int app_perror( const char *sender, const char *title, */ int main(int argc, char *argv[]) { - enum { NSAMPLES = 160, COUNT=100 }; + enum { NSAMPLES = 640, COUNT=100 }; pj_caching_pool cp; pjmedia_endpt *med_endpt; pj_pool_t *pool; @@ -123,10 +124,19 @@ int main(int argc, char *argv[]) return 1; } + if (file_port->info.samples_per_frame > NSAMPLES) { + app_perror(THIS_FILE, "WAV clock rate is too big", PJ_EINVAL); + return 1; + } + + puts("Time\tPCMU\tLinear"); + puts("------------------------"); + for (i=0; iinfo.samples_per_frame); level = pjmedia_linear2ulaw(level32) ^ 0xFF; - printf("%d ", level); + ms = i * 1000 * file_port->info.samples_per_frame / + file_port->info.clock_rate; + printf("%03d.%03d\t%7d\t%7d\n", + ms/1000, ms%1000, level, level32); } puts(""); diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/main_rtems.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/main_rtems.c similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/samples/main_rtems.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/main_rtems.c diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/mix.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/mix.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/mix.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/mix.c index fc98188f6e1c98d827a8aaaf7b15b24d51827418..05f77252178ddc5244b7c1bc5e77783b7288bb72 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/mix.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/mix.c @@ -1,5 +1,6 @@ -/* $Id: mix.c 2103 2008-07-04 23:49:44Z bennylp $ */ +/* $Id: mix.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/pcaputil.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/pcaputil.c similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/samples/pcaputil.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/pcaputil.c index 7756690427480a07b9b87c9af91752feefb817de..8caf4ab483261579fe5a28886265c781892abb4c 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/pcaputil.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/pcaputil.c @@ -1,5 +1,6 @@ -/* $Id: pcaputil.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pcaputil.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/pjsip-perf.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/pjsip-perf.c similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/samples/pjsip-perf.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/pjsip-perf.c index 5554bd65bcd056a3b48776ff49802b99c79be1a3..3bb36c1aaec006f03ac320126e2a6aef139ad901 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/pjsip-perf.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/pjsip-perf.c @@ -1,5 +1,6 @@ -/* $Id: pjsip-perf.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pjsip-perf.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/playfile.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/playfile.c similarity index 97% rename from libs/pjproject-1.0/pjsip-apps/src/samples/playfile.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/playfile.c index 16c416eb263ae6bd8312148bfbcdc59a998b71d1..37c2f4ac01032e72314507ef5342a6b2cdb17aac 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/playfile.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/playfile.c @@ -1,5 +1,6 @@ -/* $Id: playfile.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: playfile.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/playsine.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/playsine.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/playsine.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/playsine.c index 373ae86eb80660aa702be5194844770f798f6cf4..4d16aa5c72988fa06cefc81d1e74637c7a7577fe 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/playsine.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/playsine.c @@ -1,5 +1,6 @@ -/* $Id: playsine.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: playsine.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/proxy.h b/libs/pjproject-1.0.1/pjsip-apps/src/samples/proxy.h similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/samples/proxy.h rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/proxy.h index be8be57d28b359a575a1530e5b5e43d2cd3387b6..7200dcce36e8a5981413d0eafa6a25dab4b18eba 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/proxy.h +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/proxy.h @@ -1,5 +1,6 @@ -/* $Id: proxy.h 2112 2008-07-07 21:31:02Z bennylp $ */ +/* $Id: proxy.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/recfile.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/recfile.c similarity index 97% rename from libs/pjproject-1.0/pjsip-apps/src/samples/recfile.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/recfile.c index a4085b745140097cb53904957b4031497eb0c995..36c3f0c702bdc7db694dbdf2f0af7de74903ecab 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/recfile.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/recfile.c @@ -1,5 +1,6 @@ -/* $Id: recfile.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: recfile.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/resampleplay.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/resampleplay.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/resampleplay.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/resampleplay.c index 897b4df505c2f9aa9b62a61d6922167e83bc95e8..7af443f05ac20e50c3909d69df9d99899ead1032 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/resampleplay.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/resampleplay.c @@ -1,5 +1,6 @@ -/* $Id: resampleplay.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: resampleplay.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/simple_pjsua.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/simple_pjsua.c similarity index 97% rename from libs/pjproject-1.0/pjsip-apps/src/samples/simple_pjsua.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/simple_pjsua.c index fb457f439d8dbdddd74816034d603909ef394cc8..9f715d1b44ad7204221c98e6d1d930a9c500d747 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/simple_pjsua.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/simple_pjsua.c @@ -1,5 +1,6 @@ -/* $Id: simple_pjsua.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: simple_pjsua.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/simpleua.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/simpleua.c similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/samples/simpleua.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/simpleua.c index 647f77e68abbcd0584dbc812489527ad71b888cd..c4328a07b2dab8a363821ce059a9ac84b1960ebf 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/simpleua.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/simpleua.c @@ -1,5 +1,6 @@ -/* $Id: simpleua.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: simpleua.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/siprtp.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/siprtp.c similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/samples/siprtp.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/siprtp.c index a03f85903f70b8858955bbef5717328837a7420d..80a8c4cdee67bc06ebd383a6c9a7af7e1ae274b3 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/siprtp.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/siprtp.c @@ -1,5 +1,6 @@ -/* $Id: siprtp.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: siprtp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/siprtp_report.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/siprtp_report.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/siprtp_report.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/siprtp_report.c index 0b35f867ab782c7388293f19df5d1531e9c5b720..e5312509486be516bebe81d971e90d5c636fecb4 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/siprtp_report.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/siprtp_report.c @@ -1,5 +1,6 @@ -/* $Id: siprtp_report.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: siprtp_report.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/sipstateless.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/sipstateless.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/sipstateless.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/sipstateless.c index a8f01b5eb9bbd6b94d90a38aad1afc2bc93c6690..17e3b10744b83d386dddcfadfaa7f96313858c9d 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/sipstateless.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/sipstateless.c @@ -1,5 +1,6 @@ -/* $Id: sipstateless.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sipstateless.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/sndinfo.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/sndinfo.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/sndinfo.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/sndinfo.c index 34b82d11c85583ae299c7bcdac7cb41705ada20d..63d93bd805726522fec1503736665129584d9fbf 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/sndinfo.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/sndinfo.c @@ -1,5 +1,6 @@ -/* $Id: sndinfo.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sndinfo.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/sndtest.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/sndtest.c similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/samples/sndtest.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/sndtest.c index c84af3f6b59fc21003fa0978ecc8d8074950bbdf..60fc69e47f150ae0d24adb64d3defdae7d466360 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/sndtest.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/sndtest.c @@ -1,5 +1,6 @@ -/* $Id: sndtest.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sndtest.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/stateful_proxy.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/stateful_proxy.c similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/samples/stateful_proxy.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/stateful_proxy.c index aa631cee1a7b14cdc37354d5453f126917c51956..a432dc211954f49462b2aa173210d1cfabecf39a 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/stateful_proxy.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/stateful_proxy.c @@ -1,5 +1,6 @@ -/* $Id: stateful_proxy.c 2168 2008-07-23 09:59:11Z bennylp $ */ +/* $Id: stateful_proxy.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/stateless_proxy.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/stateless_proxy.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/stateless_proxy.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/stateless_proxy.c index 8f1cc102ac1d33e4a0878200578dcb8c71187a15..4ed9acd65a3ca03bfde596df8c9a79a9cb82d4fa 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/stateless_proxy.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/stateless_proxy.c @@ -1,5 +1,6 @@ -/* $Id: stateless_proxy.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: stateless_proxy.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/stereotest.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/stereotest.c similarity index 98% rename from libs/pjproject-1.0/pjsip-apps/src/samples/stereotest.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/stereotest.c index 3e16c1858f479508abc049c47e27c96f0ea0a12f..557b78647f8d7c550fa4c76fb04529b23fb2c169 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/stereotest.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/stereotest.c @@ -1,5 +1,6 @@ -/* $Id: stereotest.c 1951 2008-05-08 09:51:16Z nanang $ */ +/* $Id: stereotest.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/streamutil.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/streamutil.c similarity index 99% rename from libs/pjproject-1.0/pjsip-apps/src/samples/streamutil.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/streamutil.c index 1382153e7414ed9179ec35996a82d8cf1bb16da6..be68a0b538d545298c1cb0edfa072f6e69ed0220 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/streamutil.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/streamutil.c @@ -1,5 +1,6 @@ -/* $Id: streamutil.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: streamutil.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/strerror.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/strerror.c similarity index 93% rename from libs/pjproject-1.0/pjsip-apps/src/samples/strerror.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/strerror.c index 92f8435400585627cf4c8369d1377caf22904142..07366efdd11ef6954f72397673e84023ff8d6c48 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/strerror.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/strerror.c @@ -1,5 +1,6 @@ -/* $Id: strerror.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: strerror.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/tonegen.c b/libs/pjproject-1.0.1/pjsip-apps/src/samples/tonegen.c similarity index 97% rename from libs/pjproject-1.0/pjsip-apps/src/samples/tonegen.c rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/tonegen.c index 0b514ab985cb847db7891ab8a9c6cfcf84679ff6..e77a67001b07f5bcf2bab2558db77a0e7be7b0eb 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/samples/tonegen.c +++ b/libs/pjproject-1.0.1/pjsip-apps/src/samples/tonegen.c @@ -1,5 +1,6 @@ -/* $Id: tonegen.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: tonegen.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/samples/util.h b/libs/pjproject-1.0.1/pjsip-apps/src/samples/util.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/samples/util.h rename to libs/pjproject-1.0.1/pjsip-apps/src/samples/util.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua/main_symbian.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/main_symbian.cpp similarity index 58% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua/main_symbian.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/main_symbian.cpp index ffed788200337c659efd111525a6700d9a41d2e8..8a7f6029c840d25741ee501fb1c455e7514988ab 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua/main_symbian.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/main_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: main_symbian.cpp 2174 2008-07-24 15:30:44Z nanang $ */ +/* $Id: main_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,72 +29,9 @@ CConsoleBase* console; // Needed by APS -TPtrC APP_UID = _L("A000000E"); +TPtrC APP_UID = _L("A000000D"); -//////////////////////////////////////////////////////////////////////////// -class MyTask : public CActive -{ -public: - static MyTask *NewL(CActiveSchedulerWait *asw); - ~MyTask(); - void Start(); - -protected: - MyTask(CActiveSchedulerWait *asw); - void ConstructL(); - virtual void RunL(); - virtual void DoCancel(); - -private: - RTimer timer_; - CActiveSchedulerWait *asw_; -}; - -MyTask::MyTask(CActiveSchedulerWait *asw) -: CActive(EPriorityNormal), asw_(asw) -{ -} - -MyTask::~MyTask() -{ - timer_.Close(); -} - -void MyTask::ConstructL() -{ - timer_.CreateLocal(); - CActiveScheduler::Add(this); -} - -MyTask *MyTask::NewL(CActiveSchedulerWait *asw) -{ - MyTask *self = new (ELeave) MyTask(asw); - CleanupStack::PushL(self); - - self->ConstructL(); - - CleanupStack::Pop(self); - return self; -} - -void MyTask::Start() -{ - timer_.After(iStatus, 0); - SetActive(); -} - -void MyTask::RunL() -{ - ua_main(); - asw_->AsyncStop(); -} - -void MyTask::DoCancel() -{ - -} - //////////////////////////////////////////////////////////////////////////// LOCAL_C void DoStartL() @@ -102,18 +40,7 @@ LOCAL_C void DoStartL() CleanupStack::PushL(scheduler); CActiveScheduler::Install(scheduler); - CActiveSchedulerWait *asw = new CActiveSchedulerWait; - CleanupStack::PushL(asw); - - MyTask *task = MyTask::NewL(asw); - task->Start(); - - asw->Start(); - - delete task; - - CleanupStack::Pop(asw); - delete asw; + ua_main(); CActiveScheduler::Install(NULL); CleanupStack::Pop(scheduler); diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua/ua.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/ua.cpp similarity index 89% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua/ua.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/ua.cpp index 1eacdcb8e063b11be054c9e25d3b96cadb75a590..d9292681afc3a98f165822db2907ec9c584bfdfe 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua/ua.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/ua.cpp @@ -1,6 +1,7 @@ -/* $Id: ua.cpp 2174 2008-07-24 15:30:44Z nanang $ */ +/* $Id: ua.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -37,7 +38,7 @@ // // Account // -#define HAS_SIP_ACCOUNT 1 // 0 to disable registration +#define HAS_SIP_ACCOUNT 0 // 1 to enable registration #define SIP_DOMAIN "pjsip.lab" #define SIP_USER "400" #define SIP_PASSWD "400" @@ -46,25 +47,25 @@ // Outbound proxy for all accounts // #define SIP_PROXY NULL -//#define SIP_PROXY "sip:192.168.0.8" +//#define SIP_PROXY "" // // Configure nameserver if DNS SRV is to be used with both SIP // or STUN (for STUN see other settings below) // -//#define NAMESERVER NULL -#define NAMESERVER "192.168.0.2" +#define NAMESERVER NULL +//#define NAMESERVER "192.168.0.2" // // STUN server #if 0 // Use this to have the STUN server resolved normally # define STUN_DOMAIN NULL -# define STUN_SERVER "stun.xten.com" +# define STUN_SERVER "stun.pjsip.org" #elif 0 // Use this to have the STUN server resolved with DNS SRV -# define STUN_DOMAIN "iptel.org" +# define STUN_DOMAIN "pjsip.org" # define STUN_SERVER NULL #else // Use this to disable STUN @@ -249,6 +250,8 @@ static void on_call_replaced(pjsua_call_id old_call_id, } +//#include + /* Logging callback */ static void log_writer(int level, const char *buf, int len) { @@ -259,6 +262,7 @@ static void log_writer(int level, const char *buf, int len) pj_ansi_to_unicode(buf, len, buf16, PJ_ARRAY_SIZE(buf16)); TPtrC16 aBuf((const TUint16*)buf16, (TInt)len); + //RDebug::Print(aBuf); console->Write(aBuf); } @@ -324,7 +328,8 @@ static pj_status_t app_startup() pjsua_logging_config_default(&log_cfg); - log_cfg.console_level = 4; + log_cfg.level = LOG_LEVEL; + log_cfg.console_level = LOG_LEVEL; log_cfg.cb = &log_writer; //log_cfg.log_filename = pj_str("C:\\data\\symbian_ua.log"); @@ -435,7 +440,7 @@ static pj_status_t app_startup() class ConsoleUI : public CActive { public: - ConsoleUI(CActiveSchedulerWait *asw, CConsoleBase *con); + ConsoleUI(CConsoleBase *con); // Run console UI void Run(); @@ -451,13 +456,12 @@ protected: void RunL(); private: - CActiveSchedulerWait *asw_; CConsoleBase *con_; }; -ConsoleUI::ConsoleUI(CActiveSchedulerWait *asw, CConsoleBase *con) -: CActive(EPriorityStandard), asw_(asw), con_(con) +ConsoleUI::ConsoleUI(CConsoleBase *con) +: CActive(EPriorityStandard), con_(con) { CActiveScheduler::Add(this); } @@ -508,7 +512,7 @@ void ConsoleUI::RunL() switch (kc) { case 'w': - asw_->AsyncStop(); + CActiveScheduler::Stop(); reschedule = PJ_FALSE; break; case 'D': @@ -685,14 +689,57 @@ on_return: #include +#if 0 +// Force network connection to use the first IAP, +// this is useful for debugging on emulator without GUI. +// Include commdb.lib & apengine.lib in symbian_ua.mmp file +// if this is enabled. + +#include + +inline void ForceUseFirstIAP() +{ + TUint32 rank = 1; + TUint32 bearers; + TUint32 prompt; + TUint32 iap; + + CCommsDatabase* commDb = CCommsDatabase::NewL(EDatabaseTypeIAP); + CleanupStack::PushL(commDb); + + CApDataHandler* apDataHandler = CApDataHandler::NewLC(*commDb); + + TCommDbConnectionDirection direction = ECommDbConnectionDirectionOutgoing; + apDataHandler->GetPreferredIfDbIapTypeL(rank, direction, bearers, prompt, iap); + prompt = ECommDbDialogPrefDoNotPrompt; + apDataHandler->SetPreferredIfDbIapTypeL(rank, direction, bearers, (TCommDbDialogPref)prompt, iap, ETrue); + CleanupStack::PopAndDestroy(2); // apDataHandler, commDb +} + +static void SelectIAP() +{ + ForceUseFirstIAP(); +} + +#else + +static void SelectIAP() +{ +} + +#endif + + //////////////////////////////////////////////////////////////////////////// int ua_main() { - RSocketServ aSocketServer; - RConnection aConn; - TInt err; - pj_symbianos_params sym_params; + RSocketServ aSocketServer; + RConnection aConn; + TInt err; + pj_symbianos_params sym_params; pj_status_t status; + + SelectIAP(); // Initialize RSocketServ if ((err=aSocketServer.Connect()) != KErrNone) @@ -700,8 +747,8 @@ int ua_main() // Open up a connection if ((err=aConn.Open(aSocketServer)) != KErrNone) { - aSocketServer.Close(); - return PJ_STATUS_FROM_OS(err); + aSocketServer.Close(); + return PJ_STATUS_FROM_OS(err); } if ((err=aConn.Start()) != KErrNone) { @@ -722,39 +769,37 @@ int ua_main() if (status != PJ_SUCCESS) { aConn.Close(); aSocketServer.Close(); - return status; + return status; } // Run the UI - CActiveSchedulerWait *asw = new CActiveSchedulerWait; - ConsoleUI *con = new ConsoleUI(asw, console); + ConsoleUI *con = new ConsoleUI(console); con->Run(); - PrintMenu(); - asw->Start(); + + CActiveScheduler::Start(); delete con; - delete asw; // Dump memory statistics PJ_LOG(3,(THIS_FILE, "Max heap usage: %u.%03uMB", - pjsua_var.cp.peak_used_size / 1000000, - (pjsua_var.cp.peak_used_size % 1000000)/1000)); + pjsua_var.cp.peak_used_size / 1000000, + (pjsua_var.cp.peak_used_size % 1000000)/1000)); // check max stack usage #if defined(PJ_OS_HAS_CHECK_STACK) && PJ_OS_HAS_CHECK_STACK!=0 pj_thread_t* this_thread = pj_thread_this(); if (!this_thread) - return status; + return status; const char* max_stack_file; int max_stack_line; status = pj_thread_get_stack_info(this_thread, &max_stack_file, &max_stack_line); PJ_LOG(3,(THIS_FILE, "Max stack usage: %u at %s:%d", - pj_thread_get_stack_max_usage(this_thread), - max_stack_file, max_stack_line)); + pj_thread_get_stack_max_usage(this_thread), + max_stack_file, max_stack_line)); #endif // Shutdown pjsua @@ -762,7 +807,7 @@ int ua_main() // Close connection and socket server aConn.Close(); - aSocketServer.Close(); + aSocketServer.Close(); return status; } diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua/ua.h b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/ua.h similarity index 88% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua/ua.h rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/ua.h index fb8aac6ad6e56758fd4d8470bf80154f4730defe..ae3b150fa1e3c3f2e9a97e3dc16a90751d4ac861 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua/ua.h +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/ua.h @@ -1,5 +1,6 @@ -/* $Id: ua.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: ua.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/application.uidesign b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/application.uidesign similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/application.uidesign rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/application.uidesign diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/group/bld.inf b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/bld.inf similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/group/bld.inf rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/bld.inf diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h similarity index 93% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h index 870b138a232b2c565b6fb46386f0d946a680eadd..5a9b9c6941aaf46e84173a8c7de7f40eb96165e1 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h @@ -1,5 +1,6 @@ /* $Id: ua.cpp 1793 2008-02-14 13:39:24Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg diff --git a/libs/pjproject-1.0/pjsip/build/os-auto.mak.in b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt similarity index 100% rename from libs/pjproject-1.0/pjsip/build/os-auto.mak.in rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp similarity index 95% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp index af53f186d88f4fc946887d9143bd5be543b961e3..6d7522938b924bc781abb0d7ae49544c8af38811 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp @@ -2,7 +2,7 @@ ======================================================================== Name : Symbian_ua_guiSettingItemListSettings.cpp Author : nanang - Copyright : (c) PJSIP 2008 + Copyright : (c) 2008-2009 Teluu Inc. Description : ======================================================================== */ diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp similarity index 95% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp index 155a9597b195748de7ca6b3a9192e5076dd9798c..f722336a1b900a640f9aecab638b82c5b60f10cc 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp @@ -1,6 +1,7 @@ /* $Id: ua.cpp 1793 2008-02-14 13:39:24Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -510,3 +511,4 @@ int symbian_ua_answercall() return pjsua_call_answer(g_call_id, 200, NULL, NULL); } + diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp similarity index 96% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp index 35f8463f1ec05273b79af5dee5ef097e34895396..ac399510b2bb98b03fe0b34dbf21a021b4be41ec 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp @@ -2,7 +2,7 @@ ======================================================================== Name : symbian_ua_guiAppUi.cpp Author : nanang - Copyright : (c) PJSIP 2008 + Copyright : (c) 2008-2009 Teluu Inc. Description : ======================================================================== */ diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp similarity index 94% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp index a234b03602dc317a1261111b2aac9cbf8542987a..dc60fecd64d1cab99afdbb61aa15b9f49921935b 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp @@ -2,7 +2,7 @@ ======================================================================== Name : symbian_ua_guiApplication.cpp Author : nanang - Copyright : (c) PJSIP 2008 + Copyright : (c) 2008-2009 Teluu Inc. Description : ======================================================================== */ diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp similarity index 96% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp index d36dfbf78cf8b14a02fa25c5fdff4536968229d5..777217c7de802bbeee708c77d062236f1961d719 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp @@ -2,7 +2,7 @@ ======================================================================== Name : symbian_ua_guiContainer.cpp Author : nanang - Copyright : (c) PJSIP 2008 + Copyright : (c) 2008-2009 Teluu Inc. Description : ======================================================================== */ diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp similarity index 96% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp index d3ec1254b349eb143ba5ac784b734809dabbdf21..661c210eac8ada40713cc3b7bbe0defd198b57e5 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp @@ -2,7 +2,7 @@ ======================================================================== Name : symbian_ua_guiContainerView.cpp Author : nanang - Copyright : (c) PJSIP 2008 + Copyright : (c) 2008-2009 Teluu Inc. Description : ======================================================================== */ diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp similarity index 94% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp index 4f23d95aefc5c3a7b1e83f36e6129923bfcc378c..8eb54f8d74fed49b685ad511827c23256e1d61f4 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp @@ -2,7 +2,7 @@ ======================================================================== Name : symbian_ua_guiDocument.cpp Author : nanang - Copyright : (c) PJSIP 2008 + Copyright : (c) 2008-2009 Teluu Inc. Description : ======================================================================== */ diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp similarity index 96% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp index cd9ce1865ec51f3b6ebdd2e252e172a7aae8c641..27f3d6e5ce3c2793c376ae827d531342cea8e787 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp @@ -2,7 +2,7 @@ ======================================================================== Name : symbian_ua_guiSettingItemList.cpp Author : nanang - Copyright : (c) PJSIP 2008 + Copyright : (c) 2008-2009 Teluu Inc. Description : ======================================================================== */ diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp similarity index 96% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp index 048ba2ab08c555daf291929787516f8ad7b255f3..243ff994c57092b657a7f86bcee643b8393be22e 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp @@ -2,7 +2,7 @@ ======================================================================== Name : symbian_ua_guiSettingItemListView.cpp Author : nanang - Copyright : (c) PJSIP 2008 + Copyright : (c) 2008-2009 Teluu Inc. Description : ======================================================================== */ diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign diff --git a/libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign b/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign rename to libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign diff --git a/libs/pjproject-1.0/pjsip-apps/src/symsndtest/app_main.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/app_main.cpp similarity index 97% rename from libs/pjproject-1.0/pjsip-apps/src/symsndtest/app_main.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/app_main.cpp index 734e3d6d3a39659ce13a9947c04610217fbdf9f6..22b74bb757749db853ae51fe69a07ecff2bea270 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symsndtest/app_main.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/app_main.cpp @@ -1,6 +1,7 @@ -/* $Id: app_main.cpp 2174 2008-07-24 15:30:44Z nanang $ */ +/* $Id: app_main.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjsip-apps/src/symsndtest/main_symbian.cpp b/libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/main_symbian.cpp similarity index 94% rename from libs/pjproject-1.0/pjsip-apps/src/symsndtest/main_symbian.cpp rename to libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/main_symbian.cpp index bbf82ca9f615be15a2946d9745a6583de644ec57..e33ff6969f9fedd7f9d8e9807efa281a6536a7fe 100644 --- a/libs/pjproject-1.0/pjsip-apps/src/symsndtest/main_symbian.cpp +++ b/libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/main_symbian.cpp @@ -1,6 +1,7 @@ -/* $Id: main_symbian.cpp 2174 2008-07-24 15:30:44Z nanang $ */ +/* $Id: main_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2007 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjsip-apps/src/symsndtest/symsndtest_reg.rss b/libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/symsndtest_reg.rss similarity index 100% rename from libs/pjproject-1.0/pjsip-apps/src/symsndtest/symsndtest_reg.rss rename to libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/symsndtest_reg.rss diff --git a/libs/pjproject-1.0.1/pjsip/build/os-auto.mak b/libs/pjproject-1.0.1/pjsip/build/os-auto.mak new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/libs/pjproject-1.0.1/pjsip/build/os-auto.mak.in b/libs/pjproject-1.0.1/pjsip/build/os-auto.mak.in new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/libs/pjproject-1.0/pjsip/build/os-rtems.mak b/libs/pjproject-1.0.1/pjsip/build/os-rtems.mak similarity index 100% rename from libs/pjproject-1.0/pjsip/build/os-rtems.mak rename to libs/pjproject-1.0.1/pjsip/build/os-rtems.mak diff --git a/libs/pjproject-1.0/pjsip/build/pjsip.dsw b/libs/pjproject-1.0.1/pjsip/build/pjsip.dsw similarity index 100% rename from libs/pjproject-1.0/pjsip/build/pjsip.dsw rename to libs/pjproject-1.0.1/pjsip/build/pjsip.dsw diff --git a/libs/pjproject-1.0/pjsip/build/pjsip_core.dsp b/libs/pjproject-1.0.1/pjsip/build/pjsip_core.dsp similarity index 100% rename from libs/pjproject-1.0/pjsip/build/pjsip_core.dsp rename to libs/pjproject-1.0.1/pjsip/build/pjsip_core.dsp diff --git a/libs/pjproject-1.0/pjsip/build/pjsip_core.vcproj b/libs/pjproject-1.0.1/pjsip/build/pjsip_core.vcproj similarity index 100% rename from libs/pjproject-1.0/pjsip/build/pjsip_core.vcproj rename to libs/pjproject-1.0.1/pjsip/build/pjsip_core.vcproj diff --git a/libs/pjproject-1.0/pjsip/build/pjsip_simple.dsp b/libs/pjproject-1.0.1/pjsip/build/pjsip_simple.dsp similarity index 100% rename from libs/pjproject-1.0/pjsip/build/pjsip_simple.dsp rename to libs/pjproject-1.0.1/pjsip/build/pjsip_simple.dsp diff --git a/libs/pjproject-1.0/pjsip/build/pjsip_simple.vcproj b/libs/pjproject-1.0.1/pjsip/build/pjsip_simple.vcproj similarity index 100% rename from libs/pjproject-1.0/pjsip/build/pjsip_simple.vcproj rename to libs/pjproject-1.0.1/pjsip/build/pjsip_simple.vcproj diff --git a/libs/pjproject-1.0/pjsip/build/pjsip_ua.dsp b/libs/pjproject-1.0.1/pjsip/build/pjsip_ua.dsp similarity index 100% rename from libs/pjproject-1.0/pjsip/build/pjsip_ua.dsp rename to libs/pjproject-1.0.1/pjsip/build/pjsip_ua.dsp diff --git a/libs/pjproject-1.0/pjsip/build/pjsip_ua.vcproj b/libs/pjproject-1.0.1/pjsip/build/pjsip_ua.vcproj similarity index 100% rename from libs/pjproject-1.0/pjsip/build/pjsip_ua.vcproj rename to libs/pjproject-1.0.1/pjsip/build/pjsip_ua.vcproj diff --git a/libs/pjproject-1.0/pjsip/build/pjsua_lib.dsp b/libs/pjproject-1.0.1/pjsip/build/pjsua_lib.dsp similarity index 100% rename from libs/pjproject-1.0/pjsip/build/pjsua_lib.dsp rename to libs/pjproject-1.0.1/pjsip/build/pjsua_lib.dsp diff --git a/libs/pjproject-1.0/pjsip/build/pjsua_lib.vcproj b/libs/pjproject-1.0.1/pjsip/build/pjsua_lib.vcproj similarity index 100% rename from libs/pjproject-1.0/pjsip/build/pjsua_lib.vcproj rename to libs/pjproject-1.0.1/pjsip/build/pjsua_lib.vcproj diff --git a/libs/pjproject-1.0/pjsip/build/test_pjsip.dsp b/libs/pjproject-1.0.1/pjsip/build/test_pjsip.dsp similarity index 100% rename from libs/pjproject-1.0/pjsip/build/test_pjsip.dsp rename to libs/pjproject-1.0.1/pjsip/build/test_pjsip.dsp diff --git a/libs/pjproject-1.0/pjsip/build/test_pjsip.vcproj b/libs/pjproject-1.0.1/pjsip/build/test_pjsip.vcproj similarity index 100% rename from libs/pjproject-1.0/pjsip/build/test_pjsip.vcproj rename to libs/pjproject-1.0.1/pjsip/build/test_pjsip.vcproj diff --git a/libs/pjproject-1.0/pjsip/build/wince-evc4/pjsip_core_wince.vcp b/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_core_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjsip/build/wince-evc4/pjsip_core_wince.vcp rename to libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_core_wince.vcp diff --git a/libs/pjproject-1.0/pjsip/build/wince-evc4/pjsip_simple_wince.vcp b/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_simple_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjsip/build/wince-evc4/pjsip_simple_wince.vcp rename to libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_simple_wince.vcp diff --git a/libs/pjproject-1.0/pjsip/build/wince-evc4/pjsip_ua_wince.vcp b/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_ua_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjsip/build/wince-evc4/pjsip_ua_wince.vcp rename to libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_ua_wince.vcp diff --git a/libs/pjproject-1.0/pjsip/build/wince-evc4/pjsip_wince.vcw b/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_wince.vcw similarity index 100% rename from libs/pjproject-1.0/pjsip/build/wince-evc4/pjsip_wince.vcw rename to libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_wince.vcw diff --git a/libs/pjproject-1.0/pjsip/build/wince-evc4/pjsua_lib_wince.vcp b/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsua_lib_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjsip/build/wince-evc4/pjsua_lib_wince.vcp rename to libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsua_lib_wince.vcp diff --git a/libs/pjproject-1.0/pjsip/build/wince-evc4/test_pjsip_wince.vcp b/libs/pjproject-1.0.1/pjsip/build/wince-evc4/test_pjsip_wince.vcp similarity index 100% rename from libs/pjproject-1.0/pjsip/build/wince-evc4/test_pjsip_wince.vcp rename to libs/pjproject-1.0.1/pjsip/build/wince-evc4/test_pjsip_wince.vcp diff --git a/libs/pjproject-1.0/pjsip/docs/PJSUA-TESTING.txt b/libs/pjproject-1.0.1/pjsip/docs/PJSUA-TESTING.txt similarity index 100% rename from libs/pjproject-1.0/pjsip/docs/PJSUA-TESTING.txt rename to libs/pjproject-1.0.1/pjsip/docs/PJSUA-TESTING.txt diff --git a/libs/pjproject-1.0/pjsip/docs/TRANSPORT-PROBLEMS.TXT b/libs/pjproject-1.0.1/pjsip/docs/TRANSPORT-PROBLEMS.TXT similarity index 100% rename from libs/pjproject-1.0/pjsip/docs/TRANSPORT-PROBLEMS.TXT rename to libs/pjproject-1.0.1/pjsip/docs/TRANSPORT-PROBLEMS.TXT diff --git a/libs/pjproject-1.0/pjsip/docs/doxygen.cfg b/libs/pjproject-1.0.1/pjsip/docs/doxygen.cfg similarity index 100% rename from libs/pjproject-1.0/pjsip/docs/doxygen.cfg rename to libs/pjproject-1.0.1/pjsip/docs/doxygen.cfg diff --git a/libs/pjproject-1.0/pjsip/docs/doxygen.h b/libs/pjproject-1.0.1/pjsip/docs/doxygen.h similarity index 99% rename from libs/pjproject-1.0/pjsip/docs/doxygen.h rename to libs/pjproject-1.0.1/pjsip/docs/doxygen.h index 16a95a5ed4ab2d0ba4505ed5dd8f2225e5198540..d7a0da9e570273a6eef142d483fc12eb4b0b824f 100644 --- a/libs/pjproject-1.0/pjsip/docs/doxygen.h +++ b/libs/pjproject-1.0.1/pjsip/docs/doxygen.h @@ -1,5 +1,6 @@ /* $Id$ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/docs/footer.html b/libs/pjproject-1.0.1/pjsip/docs/footer.html similarity index 80% rename from libs/pjproject-1.0/pjsip/docs/footer.html rename to libs/pjproject-1.0.1/pjsip/docs/footer.html index 0b6d806a131632e91b0e6b9dbc9dd798254af6c8..69af57280fd784eddbc441891bcf86f88fb889ec 100644 --- a/libs/pjproject-1.0/pjsip/docs/footer.html +++ b/libs/pjproject-1.0.1/pjsip/docs/footer.html @@ -1,7 +1,7 @@

 

PJSIP Open Source, high performance, small footprint, and very very portable SIP stack
-(C)2003-2008 Benny Prijono +Copyright (C) 2006-2008 Teluu Inc.
diff --git a/libs/pjproject-1.0/pjsip/docs/header.html b/libs/pjproject-1.0.1/pjsip/docs/header.html similarity index 100% rename from libs/pjproject-1.0/pjsip/docs/header.html rename to libs/pjproject-1.0.1/pjsip/docs/header.html diff --git a/libs/pjproject-1.0/pjsip/docs/pjsip-arch.jpg b/libs/pjproject-1.0.1/pjsip/docs/pjsip-arch.jpg similarity index 100% rename from libs/pjproject-1.0/pjsip/docs/pjsip-arch.jpg rename to libs/pjproject-1.0.1/pjsip/docs/pjsip-arch.jpg diff --git a/libs/pjproject-1.0/pjsip/docs/pjsip-perf.jpg b/libs/pjproject-1.0.1/pjsip/docs/pjsip-perf.jpg similarity index 100% rename from libs/pjproject-1.0/pjsip/docs/pjsip-perf.jpg rename to libs/pjproject-1.0.1/pjsip/docs/pjsip-perf.jpg diff --git a/libs/pjproject-1.0/pjsip/docs/pjsua.jpg b/libs/pjproject-1.0.1/pjsip/docs/pjsua.jpg similarity index 100% rename from libs/pjproject-1.0/pjsip/docs/pjsua.jpg rename to libs/pjproject-1.0.1/pjsip/docs/pjsua.jpg diff --git a/libs/pjproject-1.0/pjsip/docs/siprtp.jpg b/libs/pjproject-1.0.1/pjsip/docs/siprtp.jpg similarity index 100% rename from libs/pjproject-1.0/pjsip/docs/siprtp.jpg rename to libs/pjproject-1.0.1/pjsip/docs/siprtp.jpg diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-simple/errno.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/errno.h similarity index 96% rename from libs/pjproject-1.0/pjsip/include/pjsip-simple/errno.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-simple/errno.h index b084871bd3a92722be5f46c041eeabd1a882ac3c..e716ad40a88e3440382122dbe677741f05d6c99a 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-simple/errno.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/errno.h @@ -1,5 +1,6 @@ -/* $Id: errno.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: errno.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-simple/evsub.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/evsub.h similarity index 99% rename from libs/pjproject-1.0/pjsip/include/pjsip-simple/evsub.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-simple/evsub.h index 9e508d840204f9ede3baa159bae0b0165b61eb77..d01c71d7e079117e76a16cc540699be12aede816 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-simple/evsub.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/evsub.h @@ -1,5 +1,6 @@ -/* $Id: evsub.h 2149 2008-07-17 13:53:41Z bennylp $ */ +/* $Id: evsub.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-simple/evsub_msg.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/evsub_msg.h similarity index 96% rename from libs/pjproject-1.0/pjsip/include/pjsip-simple/evsub_msg.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-simple/evsub_msg.h index 94426c43c0055c9402e8dc9cc3c4f3261a89ece9..32211db7954ea59cd3dc4cb58d65a6b7199c8396 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-simple/evsub_msg.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/evsub_msg.h @@ -1,5 +1,6 @@ -/* $Id: evsub_msg.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: evsub_msg.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-simple/iscomposing.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/iscomposing.h similarity index 97% rename from libs/pjproject-1.0/pjsip/include/pjsip-simple/iscomposing.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-simple/iscomposing.h index 09976267236d04689d23486ecdf63cf869f6e3d1..c0635b63556650f0ba19cf38c657222e013bb92d 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-simple/iscomposing.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/iscomposing.h @@ -1,5 +1,6 @@ -/* $Id: iscomposing.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: iscomposing.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-simple/pidf.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/pidf.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip-simple/pidf.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-simple/pidf.h index 9e8ebbbe56432ad47392c45501d3fb5cf7a78081..44d0c24d3a84e57b7ef2aa1f39ac392f371613cb 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-simple/pidf.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/pidf.h @@ -1,5 +1,6 @@ -/* $Id: pidf.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pidf.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-simple/presence.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/presence.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip-simple/presence.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-simple/presence.h index cfc7b9e88684434ed19f1624551aae78e960dbeb..53fbe63d348d31053746c7f7ba0f10376bb3120e 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-simple/presence.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/presence.h @@ -1,5 +1,6 @@ -/* $Id: presence.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: presence.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-simple/publish.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/publish.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip-simple/publish.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-simple/publish.h index 24676d0e4ceacde64e968dd57d7dd694058cef83..c77f2e9fd1002aecaa5531202657254bcf84b622 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-simple/publish.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/publish.h @@ -1,5 +1,6 @@ -/* $Id: publish.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: publish.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-simple/rpid.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/rpid.h similarity index 97% rename from libs/pjproject-1.0/pjsip/include/pjsip-simple/rpid.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-simple/rpid.h index 2d3f426fe2814bcdcd352b668771eadc756e9b0d..fb13ef90a0b94d9497f8de565c832a954022ba20 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-simple/rpid.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/rpid.h @@ -1,5 +1,6 @@ -/* $Id: rpid.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: rpid.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-simple/types.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/types.h similarity index 89% rename from libs/pjproject-1.0/pjsip/include/pjsip-simple/types.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-simple/types.h index 3ce32b7bea5d8bc90a6789f91e2039a6af572afb..fec50a5f37a699cb91e3cd0b73a1582efa5ab422 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-simple/types.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/types.h @@ -1,5 +1,6 @@ -/* $Id: types.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: types.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-simple/xpidf.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/xpidf.h similarity index 96% rename from libs/pjproject-1.0/pjsip/include/pjsip-simple/xpidf.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-simple/xpidf.h index 9d0450a54e37434cbda8cea12615e1ca89e129ba..d56ccf3fa0e0f74b9141396e8d8dede91f1b3686 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-simple/xpidf.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/xpidf.h @@ -1,5 +1,6 @@ -/* $Id: xpidf.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: xpidf.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_100rel.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_100rel.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_100rel.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_100rel.h index eac4a6e8039f7e8c4da94f1a69069f89a8875976..4f909856084cd8bfb242f9f0aad24b7a5b7096e1 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_100rel.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_100rel.h @@ -1,5 +1,6 @@ -/* $Id: sip_100rel.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_100rel.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_inv.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_inv.h similarity index 84% rename from libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_inv.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_inv.h index 476d3fa968e9a57a31113650406d44d1767b2af7..f4066b4fa7a96cf5f598e127c97b27aa8afb1832 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_inv.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_inv.h @@ -1,5 +1,6 @@ -/* $Id: sip_inv.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_inv.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -115,7 +116,6 @@ typedef struct pjsip_inv_callback */ void (*on_state_changed)(pjsip_inv_session *inv, pjsip_event *e); - /** * This callback is called when the invite usage module has created * a new dialog and invite because of forked outgoing request. @@ -214,6 +214,56 @@ typedef struct pjsip_inv_callback */ void (*on_send_ack)(pjsip_inv_session *inv, pjsip_rx_data *rdata); + /** + * This callback is called when the session is about to resend the + * INVITE request to the specified target, following the previously + * received redirection response. + * + * Application may accept the redirection to the specified target + * (the default behavior if this callback is implemented), reject + * this target only and make the session continue to try the next + * target in the list if such target exists, stop the whole + * redirection process altogether and cause the session to be + * disconnected, or defer the decision to ask for user confirmation. + * + * This callback is optional. If this callback is not implemented, + * the default behavior is to NOT follow the redirection response. + * + * @param inv The invite session. + * @param target The current target to be tried. + * @param e The event that caused this callback to be called. + * This could be the receipt of 3xx response, or + * 4xx/5xx response received for the INVITE sent to + * subsequent targets, or NULL if this callback is + * called from within #pjsip_inv_process_redirect() + * context. + * + * @return Action to be performed for the target. Set this + * parameter to one of the value below: + * - PJSIP_REDIRECT_ACCEPT: immediately accept the + * redirection to this target. When set, the + * session will immediately resend INVITE request + * to the target after this callback returns. + * - PJSIP_REDIRECT_REJECT: immediately reject this + * target. The session will continue retrying with + * next target if present, or disconnect the call + * if there is no more target to try. + * - PJSIP_REDIRECT_STOP: stop the whole redirection + * process and immediately disconnect the call. The + * on_state_changed() callback will be called with + * PJSIP_INV_STATE_DISCONNECTED state immediately + * after this callback returns. + * - PJSIP_REDIRECT_PENDING: set to this value if + * no decision can be made immediately (for example + * to request confirmation from user). Application + * then MUST call #pjsip_inv_process_redirect() + * to either accept or reject the redirection upon + * getting user decision. + */ + pjsip_redirect_op (*on_redirected)(pjsip_inv_session *inv, + const pjsip_uri *target, + const pjsip_event *e); + } pjsip_inv_callback; @@ -276,6 +326,7 @@ struct pjsip_inv_session unsigned options; /**< Options in use. */ pjmedia_sdp_neg *neg; /**< Negotiator. */ pjsip_transaction *invite_tsx; /**< 1st invite tsx. */ + pjsip_tx_data *invite_req; /**< Saved invite req */ pjsip_tx_data *last_answer; /**< Last INVITE resp. */ pjsip_tx_data *last_ack; /**< Last ACK request */ pj_int32_t last_ack_cseq; /**< CSeq of last ACK */ @@ -474,6 +525,53 @@ PJ_DECL(pj_status_t) pjsip_inv_terminate( pjsip_inv_session *inv, pj_bool_t notify ); +/** + * Restart UAC session and prepare the session for a new initial INVITE. + * This function can be called for example when the application wants to + * follow redirection response with a new call reusing this session so + * that the new call will have the same Call-ID and From headers. After + * the session is restarted, application may create and send a new INVITE + * request. + * + * @param inv The invite session. + * @param new_offer Should be set to PJ_TRUE since the application will + * restart the session. + * + * @return PJ_SUCCESS on successful operation. + */ +PJ_DECL(pj_status_t) pjsip_inv_uac_restart(pjsip_inv_session *inv, + pj_bool_t new_offer); + + +/** + * Accept or reject redirection response. Application MUST call this function + * after it signaled PJSIP_REDIRECT_PENDING in the \a on_redirected() + * callback, to notify the invite session whether to accept or reject the + * redirection to the current target. Application can use the combination of + * PJSIP_REDIRECT_PENDING command in \a on_redirected() callback and this + * function to ask for user permission before redirecting the call. + * + * Note that if the application chooses to reject or stop redirection (by + * using PJSIP_REDIRECT_REJECT or PJSIP_REDIRECT_STOP respectively), the + * session disconnection callback will be called before this function returns. + * And if the application rejects the target, the \a on_redirected() callback + * may also be called before this function returns if there is another target + * to try. + * + * @param inv The invite session. + * @param cmd Redirection operation. The semantic of this argument + * is similar to the description in the \a on_redirected() + * callback, except that the PJSIP_REDIRECT_PENDING is + * not accepted here. + * @param e Should be set to NULL. + * + * @return PJ_SUCCESS on successful operation. + */ +PJ_DECL(pj_status_t) pjsip_inv_process_redirect(pjsip_inv_session *inv, + pjsip_redirect_op cmd, + pjsip_event *e); + + /** * Create the initial INVITE request for this session. This function can only * be called for UAC session. If local media capability is specified when diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_regc.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_regc.h similarity index 99% rename from libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_regc.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_regc.h index a783215eb6d3eef341c90b12d0475a13325c6b63..4b2c33aa33b0d7a5b9642a8178c628386061f5eb 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_regc.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_regc.h @@ -1,5 +1,6 @@ -/* $Id: sip_regc.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_regc.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_replaces.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_replaces.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_replaces.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_replaces.h index ee647157942e80169d13104dbe299db863972082..582650c71396e66dc0e36e0470b55fd2096b7ecd 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_replaces.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_replaces.h @@ -1,5 +1,6 @@ -/* $Id: sip_replaces.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_replaces.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_xfer.h b/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_xfer.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_xfer.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_xfer.h index b88720a18edf0b2af13dd3cf98347a0d555e33ff..f816406f120d0285667973174d3b83a2d1ee0a70 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip-ua/sip_xfer.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_xfer.h @@ -1,5 +1,6 @@ -/* $Id: sip_xfer.h 2121 2008-07-11 00:56:07Z bennylp $ */ +/* $Id: sip_xfer.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip.h b/libs/pjproject-1.0.1/pjsip/include/pjsip.h similarity index 93% rename from libs/pjproject-1.0/pjsip/include/pjsip.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip.h index 2fb889e994e9cf7ef22e5810190e1422fcc7cd3a..b5ebb7301ed7fad74fb0c3a157411f6069bf4cfb 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip.h @@ -1,5 +1,6 @@ -/* $Id: pjsip.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pjsip.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/print_util.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/print_util.h similarity index 97% rename from libs/pjproject-1.0/pjsip/include/pjsip/print_util.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/print_util.h index 8ac8167800a675d1f9188f0ebe6f3f5deb07fb4a..686bc9e5d36194f3b8e34be62493644c12dee3d8 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/print_util.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/print_util.h @@ -1,5 +1,6 @@ -/* $Id: print_util.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: print_util.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_auth.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth.h similarity index 99% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_auth.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth.h index 4a1201c35ac1ef7edbe57600ef693e7de27cc532..cd00d3d6216af9f2b9aa81b9322ecf08ba3f40c2 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_auth.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth.h @@ -1,5 +1,6 @@ -/* $Id: sip_auth.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_auth.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_auth_aka.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_aka.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_auth_aka.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_aka.h index 12675246129f958eeb5d722e079010d22a301995..0f36beceddf5eb02c700a6dcaef9acb0592dcb29 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_auth_aka.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_aka.h @@ -1,5 +1,6 @@ -/* $Id: sip_auth_aka.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_auth_aka.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_auth_msg.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_msg.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_auth_msg.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_msg.h index 144677a51827901e7cdb3cc611e00b6a664b79be..473a231cd3ed5d83d7512eb9d40e14de24a497be 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_auth_msg.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_msg.h @@ -1,5 +1,6 @@ -/* $Id: sip_auth_msg.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_auth_msg.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_auth_parser.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_parser.h similarity index 95% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_auth_parser.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_parser.h index 4acf033cd0ebc4f45708a5e8fa5db494cd0b787e..64596f34fd65b4efe2eea6be94768da06d096954 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_auth_parser.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_parser.h @@ -1,5 +1,6 @@ -/* $Id: sip_auth_parser.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_auth_parser.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h new file mode 100644 index 0000000000000000000000000000000000000000..ff184d20d616b16ad37f2b09f6d43c1ac2b9f35b --- /dev/null +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h @@ -0,0 +1,40 @@ +/* pjsip/include/pjsip/sip_autoconf.h. Generated by configure. */ +/* $Id: sip_autoconf.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ +/* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef __PJSIP_SIP_AUTOCONF_H__ +#define __PJSIP_SIP_AUTOCONF_H__ + +/** + * @file sip_autoconf.h + * @brief Describes operating system specifics (automatically detected by + * autoconf) + */ + +/** + * Enable/disable TLS transport, as configured by autoconf. + * But only do this if user doesn't explicitly configure in pj/config_site.h. + */ +#ifndef PJSIP_HAS_TLS_TRANSPORT +/* #undef PJSIP_HAS_TLS_TRANSPORT */ +#endif + + +#endif /* __PJSIP_SIP_AUTOCONF_H__ */ + diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_autoconf.h.in b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h.in similarity index 86% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_autoconf.h.in rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h.in index f330e59dad14c8325e5732f846df4b4a70c72873..cb753905e54ae072b4a0558ba531f35d9ef6ee43 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_autoconf.h.in +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h.in @@ -1,6 +1,7 @@ -/* $Id: sip_autoconf.h.in 862 2006-12-25 20:34:14Z bennylp $ */ +/* $Id: sip_autoconf.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ /* - * Copyright (C) 2003-2006 Benny Prijono + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) + * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_config.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_config.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_config.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_config.h index 5a55b9af03ac8196ad0c26b699124ceda65c7ea8..d0524a8a798093797f4a92bf48523cb29c91a0aa 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_config.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_config.h @@ -1,5 +1,6 @@ -/* $Id: sip_config.h 2131 2008-07-13 13:12:36Z bennylp $ */ +/* $Id: sip_config.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -413,7 +414,7 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void) * Default: CRLF */ #ifndef PJSIP_TCP_KEEP_ALIVE_DATA -# define PJSIP_TCP_KEEP_ALIVE_DATA { "\r\n", 2 } +# define PJSIP_TCP_KEEP_ALIVE_DATA { "\r\n\r\n", 4 } #endif @@ -436,7 +437,7 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void) * Default: CRLF */ #ifndef PJSIP_TLS_KEEP_ALIVE_DATA -# define PJSIP_TLS_KEEP_ALIVE_DATA { "\r\n", 2 } +# define PJSIP_TLS_KEEP_ALIVE_DATA { "\r\n\r\n", 4 } #endif diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_dialog.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_dialog.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_dialog.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_dialog.h index bb36f82397a337df9986dfb9072c4409b9e0122e..762458f6e1c8626d015b08915adf4450eae997c2 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_dialog.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_dialog.h @@ -1,5 +1,6 @@ -/* $Id: sip_dialog.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_dialog.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -29,6 +30,7 @@ #include #include #include +#include #include #include @@ -121,6 +123,7 @@ struct pjsip_dialog /* Dialog's session properties. */ pjsip_dialog_state state; /**< Dialog state. */ pjsip_uri *target; /**< Current target. */ + pjsip_target_set target_set; /**< Target set, for UAC only. */ pjsip_hdr inv_hdr; /**< Headers from hparam in dest URL */ pjsip_dlg_party local; /**< Local party info. */ pjsip_dlg_party remote; /**< Remote party info. */ diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_endpoint.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_endpoint.h similarity index 99% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_endpoint.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_endpoint.h index 0a612f3fa6bafe23623a63bba3797e517eac1310..a2bd412df6cf7166ee2844c78cab3cc6568131f2 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_endpoint.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_endpoint.h @@ -1,5 +1,6 @@ -/* $Id: sip_endpoint.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_endpoint.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_errno.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_errno.h similarity index 99% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_errno.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_errno.h index bd3629f63f66cb0bc41e465ae9d008ae01b8bba3..2cd10b2a907205ebc278b3701483582528d1f678 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_errno.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_errno.h @@ -1,5 +1,6 @@ -/* $Id: sip_errno.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_errno.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_event.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_event.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_event.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_event.h index 3e2aafa33a37e5b4afaaae84b9443be7baae08c9..135a11d93f5fe44f83271926b37022550daeec05 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_event.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_event.h @@ -1,5 +1,6 @@ -/* $Id: sip_event.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_event.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_module.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_module.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_module.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_module.h index 973244a5effdeaead12bc1eba761dcb4d2ee04a8..81361fbd2d55e0d1fb246b72a1cfdbc318569517 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_module.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_module.h @@ -1,5 +1,6 @@ -/* $Id: sip_module.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_module.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_msg.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_msg.h similarity index 99% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_msg.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_msg.h index 466df3bef8dbb0fe26c535bfd95618bdbc5b96b9..b1dc2c04c5345d1072d05ef6637393254b0fc565 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_msg.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_msg.h @@ -1,5 +1,6 @@ -/* $Id: sip_msg.h 2146 2008-07-16 12:31:57Z bennylp $ */ +/* $Id: sip_msg.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_parser.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_parser.h similarity index 99% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_parser.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_parser.h index af0f60b30ebaba02581124cd96876cb87e8f9fc6..85ac781cd573c1ac2d9d8f7f5ed3b71eeb0e487f 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_parser.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_parser.h @@ -1,5 +1,6 @@ -/* $Id: sip_parser.h 2193 2008-08-05 19:28:17Z bennylp $ */ +/* $Id: sip_parser.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_private.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_private.h similarity index 89% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_private.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_private.h index 8247d76d4ef6acb149a563211b206f05ebfa3695..6a5bb0b88091e8669bc563cea7554cf7f42e6a20 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_private.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_private.h @@ -1,5 +1,6 @@ -/* $Id: sip_private.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_private.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_resolve.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_resolve.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_resolve.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_resolve.h index 63a02e1e3b1904ff336dc83353691334d78568fe..4eaf2d4a6e321cdc7c973eadf92abb8f3b2c42c2 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_resolve.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_resolve.h @@ -1,5 +1,6 @@ -/* $Id: sip_resolve.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_resolve.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_tel_uri.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_tel_uri.h similarity index 94% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_tel_uri.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_tel_uri.h index 48d7dfe8f5004a7b8c7b862c910c948b725f3f7a..98e2f8bbb800f4339748ae02c6ad8fbb7b92160a 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_tel_uri.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_tel_uri.h @@ -1,5 +1,6 @@ -/* $Id: sip_tel_uri.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_tel_uri.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transaction.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transaction.h similarity index 99% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_transaction.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transaction.h index 0c2d986b76e44783ca12bd182897a5e6e2b4f43f..98d40f49fa6f63f46bb09fbef7c69b860b9e6591 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transaction.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transaction.h @@ -1,5 +1,6 @@ -/* $Id: sip_transaction.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_transaction.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transport.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport.h similarity index 99% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_transport.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport.h index 44803ef84afff27299bec95ad25cf9bf08ea1173..1c7e9c6ba613bdf676bd5e5d784ffd8ba5f581fb 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transport.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport.h @@ -1,5 +1,6 @@ -/* $Id: sip_transport.h 2326 2008-09-27 08:55:16Z bennylp $ */ +/* $Id: sip_transport.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_loop.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_loop.h similarity index 97% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_loop.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_loop.h index d3cc1c9eb51557dedeca649ec1c88cc0ca2031a9..534ba231247f016e3f6dc62e6600f73653c44220 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_loop.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_loop.h @@ -1,5 +1,6 @@ -/* $Id: sip_transport_loop.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_transport_loop.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_tcp.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_tcp.h similarity index 97% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_tcp.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_tcp.h index c33e6cff5b2aed1fe04d65a416c47638a16a2590..5fe5a52e100dd4354d1c05675a34714b6fe37b10 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_tcp.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_tcp.h @@ -1,5 +1,6 @@ -/* $Id: sip_transport_tcp.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_transport_tcp.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_tls.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_tls.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_tls.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_tls.h index a9fb74b8e11776a2108f4562e680459130d7fac9..4c5d1b6a67c97235d093ed14f10a267fbed25826 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_tls.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_tls.h @@ -1,5 +1,6 @@ -/* $Id: sip_transport_tls.h 2094 2008-07-01 15:31:59Z bennylp $ */ +/* $Id: sip_transport_tls.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_udp.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_udp.h similarity index 98% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_udp.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_udp.h index 8da6faefc8fddbec4df99cb8fb1d1f935b38fab2..383073c9f2baa09c14b4f95e805d773eaebf30d3 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_transport_udp.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_udp.h @@ -1,5 +1,6 @@ -/* $Id: sip_transport_udp.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_transport_udp.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_types.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_types.h similarity index 97% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_types.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_types.h index 17beec550f0a93de6f028f1b7650367e7559951e..717605dcd2f5ed2b994c5439f96a66fca39318ef 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_types.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_types.h @@ -1,5 +1,6 @@ -/* $Id: sip_types.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_types.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_ua_layer.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_ua_layer.h similarity index 97% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_ua_layer.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_ua_layer.h index ca3e15f2cce6b1b47b7e86d6dc0f3040d5c6a610..a94a1d7d0c14320388da6dbc8cb130a578491790 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_ua_layer.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_ua_layer.h @@ -1,5 +1,6 @@ -/* $Id: sip_ua_layer.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_ua_layer.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_uri.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_uri.h similarity index 99% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_uri.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_uri.h index 9f585cf28e0452a97628465747a969009d90f349..e5458e4bb15fd2050e51b6b8db8584ddc80dec95 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_uri.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_uri.h @@ -1,5 +1,6 @@ -/* $Id: sip_uri.h 2193 2008-08-05 19:28:17Z bennylp $ */ +/* $Id: sip_uri.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip/sip_util.h b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_util.h similarity index 79% rename from libs/pjproject-1.0/pjsip/include/pjsip/sip_util.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip/sip_util.h index cd4af9c0bb867321d75040b2c14039dcfefc33c8..1e49abdc83b99234ebcfc051f01e134a50b45fe4 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip/sip_util.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_util.h @@ -1,5 +1,6 @@ -/* $Id: sip_util.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_util.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -25,6 +26,195 @@ PJ_BEGIN_DECL +/** + * @defgroup PJSIP_ENDPT_TARGET_URI Target URI Management + * @ingroup PJSIP_CORE_CORE + * @brief Management of target URI's in case of redirection + * @{ + * This module provides utility functions to manage target set for UAC. + * The target set is provided as pjsip_target_set structure. Initially, + * the target set for UAC contains only one target, that is the target of + * the initial request. When 3xx/redirection class response is received, + * the UAC can use the functionality of this module to add the URI's listed + * in the Contact header(s) in the response to the target set, and retry + * sending the request to the next destination/target. The UAC may retry + * this sequentially until one of the target answers with succesful/2xx + * response, or one target returns global error/6xx response, or all targets + * are exhausted. + * + * This module is currently used by the \ref PJSIP_INV. + */ + +/** + * This structure describes a target, which can be chained together to form + * a target set. Each target contains an URI, priority (as q-value), and + * the last status code and reason phrase received from the target, if the + * target has been contacted. If the target has not been contacted, the + * status code field will be zero. + */ +typedef struct pjsip_target +{ + PJ_DECL_LIST_MEMBER(struct pjsip_target);/**< Standard list element */ + pjsip_uri *uri; /**< The target URI */ + int q1000; /**< q-value multiplied by 1000 */ + pjsip_status_code code; /**< Last status code received */ + pj_str_t reason; /**< Last reason phrase received */ +} pjsip_target; + + +/** + * This describes a target set. A target set contains a linked-list of + * pjsip_target. + */ +typedef struct pjsip_target_set +{ + pjsip_target head; /**< Target linked-list head */ + pjsip_target *current; /**< Current target. */ +} pjsip_target_set; + + +/** + * These enumerations specify the action to be performed to a redirect + * response. + */ +typedef enum pjsip_redirect_op +{ + /** + * Reject the redirection to the current target. The UAC will + * select the next target from the target set if exists. + */ + PJSIP_REDIRECT_REJECT, + + /** + * Accept the redirection to the current target. The INVITE request + * will be resent to the current target. + */ + PJSIP_REDIRECT_ACCEPT, + + /** + * Defer the redirection decision, for example to request permission + * from the end user. + */ + PJSIP_REDIRECT_PENDING, + + /** + * Stop the whole redirection process altogether. This will cause + * the invite session to be disconnected. + */ + PJSIP_REDIRECT_STOP + +} pjsip_redirect_op; + + +/** + * Initialize target set. This will empty the list of targets in the + * target set. + * + * @param tset The target set. + */ +PJ_INLINE(void) pjsip_target_set_init(pjsip_target_set *tset) +{ + pj_list_init(&tset->head); + tset->current = NULL; +} + + +/** + * Add an URI to the target set, if the URI is not already in the target set. + * The URI comparison rule of pjsip_uri_cmp() will be used to determine the + * equality of this URI compared to existing URI's in the target set. The + * URI will be cloned using the specified memory pool before it is added to + * the list. + * + * The first URI added to the target set will also be made current target + * by this function. + * + * @param tset The target set. + * @param pool The memory pool to be used to duplicate the URI. + * @param uri The URI to be checked and added. + * @param q1000 The q-value multiplied by 1000. + * + * @return PJ_SUCCESS if the URI was added to the target set, + * or PJ_EEXISTS if the URI already exists in the target + * set, or other error codes. + */ +PJ_DECL(pj_status_t) pjsip_target_set_add_uri(pjsip_target_set *tset, + pj_pool_t *pool, + const pjsip_uri *uri, + int q1000); + +/** + * Extract URI's in the Contact headers of the specified (response) message + * and add them to the target set. This function will also check if the + * URI's already exist in the target set before adding them to the list. + * + * @param tset The target set. + * @param pool The memory pool to be used to duplicate the URI's. + * @param msg SIP message from which the Contact headers will be + * scanned and the URI's to be extracted, checked, and + * added to the target set. + * + * @return PJ_SUCCESS if at least one URI was added to the + * target set, or PJ_EEXISTS if all URI's in the message + * already exists in the target set or if the message + * doesn't contain usable Contact headers, or other error + * codes. + */ +PJ_DECL(pj_status_t) pjsip_target_set_add_from_msg(pjsip_target_set *tset, + pj_pool_t *pool, + const pjsip_msg *msg); + +/** + * Get the next target to be retried. This function will scan the target set + * for target which hasn't been tried, and return one target with the + * highest q-value, if such target exists. This function will return NULL + * if there is one target with 2xx or 6xx code or if all targets have been + * tried. + * + * @param tset The target set. + * + * @return The next target to be tried, or NULL if all targets have + * been tried or at least one target returns 2xx or 6xx + * response. + */ +PJ_DECL(pjsip_target*) +pjsip_target_set_get_next(const pjsip_target_set *tset); + + +/** + * Set the specified target as the current target in the target set. The + * current target may be used by application to keep track on which target + * is currently being operated on. + * + * @param tset The target set. + * @param target The target to be set as current target. + * + * @return PJ_SUCCESS or the appropriate error code. + */ +PJ_DECL(pj_status_t) pjsip_target_set_set_current(pjsip_target_set *tset, + pjsip_target *target); + + +/** + * Set the status code and reason phrase of the specified target. + * + * @param target The target. + * @param pool The memory pool to be used to duplicate the reason phrase. + * @param code The SIP status code to be set to the target. + * @param reason The reason phrase to be set to the target. + * + * @return PJ_SUCCESS on successful operation or the appropriate + * error code. + */ +PJ_DECL(pj_status_t) pjsip_target_assign_status(pjsip_target *target, + pj_pool_t *pool, + int status_code, + const pj_str_t *reason); + +/** + * @} + */ + /** * @defgroup PJSIP_ENDPT_STATELESS Message Creation and Stateless Operations * @ingroup PJSIP_CORE_CORE diff --git a/libs/pjproject-1.0/pjsip/include/pjsip_auth.h b/libs/pjproject-1.0.1/pjsip/include/pjsip_auth.h similarity index 90% rename from libs/pjproject-1.0/pjsip/include/pjsip_auth.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip_auth.h index 19390d01c309f3d1480dbf36f415b9d829b602d1..1fb8abee040a23d0891140005c0a910979215705 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip_auth.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip_auth.h @@ -1,5 +1,6 @@ -/* $Id: pjsip_auth.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pjsip_auth.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip_simple.h b/libs/pjproject-1.0.1/pjsip/include/pjsip_simple.h similarity index 91% rename from libs/pjproject-1.0/pjsip/include/pjsip_simple.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip_simple.h index 71eb076fa3467f6393df473d84cb35045e564229..f1f925f322f08a465ed43a034be06675d3af6604 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip_simple.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip_simple.h @@ -1,5 +1,6 @@ -/* $Id: pjsip_simple.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pjsip_simple.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsip_ua.h b/libs/pjproject-1.0.1/pjsip/include/pjsip_ua.h similarity index 89% rename from libs/pjproject-1.0/pjsip/include/pjsip_ua.h rename to libs/pjproject-1.0.1/pjsip/include/pjsip_ua.h index 52607a71e1e3fdb6c389b63ab9e2695d1392cafe..4e14cb45f81a2da8bfc30be46b8aa3305f4c2a22 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsip_ua.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsip_ua.h @@ -1,5 +1,6 @@ -/* $Id: pjsip_ua.h 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pjsip_ua.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/include/pjsua-lib/pjsua.h b/libs/pjproject-1.0.1/pjsip/include/pjsua-lib/pjsua.h similarity index 97% rename from libs/pjproject-1.0/pjsip/include/pjsua-lib/pjsua.h rename to libs/pjproject-1.0.1/pjsip/include/pjsua-lib/pjsua.h index 296e81ee25662b5369c389dfd3c0c6267a7a9172..1851d0b9d8db5ba377d0bccf35c4e72d2e9ddc56 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsua-lib/pjsua.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsua-lib/pjsua.h @@ -1,5 +1,6 @@ -/* $Id: pjsua.h 2315 2008-09-24 10:10:15Z bennylp $ */ +/* $Id: pjsua.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -1062,6 +1063,56 @@ typedef struct pjsua_callback */ void (*on_nat_detect)(const pj_stun_nat_detect_result *res); + /** + * This callback is called when the call is about to resend the + * INVITE request to the specified target, following the previously + * received redirection response. + * + * Application may accept the redirection to the specified target + * (the default behavior if this callback is implemented), reject + * this target only and make the session continue to try the next + * target in the list if such target exists, stop the whole + * redirection process altogether and cause the session to be + * disconnected, or defer the decision to ask for user confirmation. + * + * This callback is optional. If this callback is not implemented, + * the default behavior is to NOT follow the redirection response. + * + * @param call_id The call ID. + * @param target The current target to be tried. + * @param e The event that caused this callback to be called. + * This could be the receipt of 3xx response, or + * 4xx/5xx response received for the INVITE sent to + * subsequent targets, or NULL if this callback is + * called from within #pjsua_call_process_redirect() + * context. + * + * @return Action to be performed for the target. Set this + * parameter to one of the value below: + * - PJSIP_REDIRECT_ACCEPT: immediately accept the + * redirection (default value). When set, the + * call will immediately resend INVITE request + * to the target. + * - PJSIP_REDIRECT_REJECT: immediately reject this + * target. The call will continue retrying with + * next target if present, or disconnect the call + * if there is no more target to try. + * - PJSIP_REDIRECT_STOP: stop the whole redirection + * process and immediately disconnect the call. The + * on_call_state() callback will be called with + * PJSIP_INV_STATE_DISCONNECTED state immediately + * after this callback returns. + * - PJSIP_REDIRECT_PENDING: set to this value if + * no decision can be made immediately (for example + * to request confirmation from user). Application + * then MUST call #pjsua_call_process_redirect() + * to either accept or reject the redirection upon + * getting user decision. + */ + pjsip_redirect_op (*on_call_redirected)(pjsua_call_id call_id, + const pjsip_uri *target, + const pjsip_event *e); + } pjsua_callback; @@ -2004,7 +2055,7 @@ PJ_DECL(pj_status_t) pjsua_transport_close( pjsua_transport_id id, * either "sip" or "sips". */ #ifndef PJSUA_SECURE_SCHEME -# define PJSUA_SECURE_SCHEME "sips" +# define PJSUA_SECURE_SCHEME "sip" #endif @@ -2080,6 +2131,18 @@ typedef struct pjsua_acc_config */ pj_str_t force_contact; + /** + * Additional URI parameters that will be appended in the Contact header + * for this account. This will affect the Contact header in all SIP + * messages sent on behalf of this account, including but not limited to + * REGISTER, INVITE, and SUBCRIBE requests or responses. + * + * The parameters should be preceeded by semicolon, and all strings must + * be properly escaped. Example: + * ";my-param=X;another-param=Hi%20there" + */ + pj_str_t contact_params; + /** * Specify whether support for reliable provisional response (100rel and * PRACK) should be required for all sessions of this account. @@ -3132,6 +3195,32 @@ PJ_DECL(pj_status_t) pjsua_call_hangup(pjsua_call_id call_id, const pj_str_t *reason, const pjsua_msg_data *msg_data); +/** + * Accept or reject redirection response. Application MUST call this function + * after it signaled PJSIP_REDIRECT_PENDING in the \a on_call_redirected() + * callback, to notify the call whether to accept or reject the redirection + * to the current target. Application can use the combination of + * PJSIP_REDIRECT_PENDING command in \a on_call_redirected() callback and + * this function to ask for user permission before redirecting the call. + * + * Note that if the application chooses to reject or stop redirection (by + * using PJSIP_REDIRECT_REJECT or PJSIP_REDIRECT_STOP respectively), the + * call disconnection callback will be called before this function returns. + * And if the application rejects the target, the \a on_call_redirected() + * callback may also be called before this function returns if there is + * another target to try. + * + * @param call_id The call ID. + * @param cmd Redirection operation to be applied to the current + * target. The semantic of this argument is similar + * to the description in the \a on_call_redirected() + * callback, except that the PJSIP_REDIRECT_PENDING is + * not accepted here. + * + * @return PJ_SUCCESS on successful operation. + */ +PJ_DECL(pj_status_t) pjsua_call_process_redirect(pjsua_call_id call_id, + pjsip_redirect_op cmd); /** * Put the specified call on hold. This will send re-INVITE with the diff --git a/libs/pjproject-1.0/pjsip/include/pjsua-lib/pjsua_internal.h b/libs/pjproject-1.0.1/pjsip/include/pjsua-lib/pjsua_internal.h similarity index 99% rename from libs/pjproject-1.0/pjsip/include/pjsua-lib/pjsua_internal.h rename to libs/pjproject-1.0.1/pjsip/include/pjsua-lib/pjsua_internal.h index 886211a930d88a3ecd9419e07807f6e78fbc69e9..b93a835a30d498827a954b9bf7fbe5558826fe12 100644 --- a/libs/pjproject-1.0/pjsip/include/pjsua-lib/pjsua_internal.h +++ b/libs/pjproject-1.0.1/pjsip/include/pjsua-lib/pjsua_internal.h @@ -1,5 +1,6 @@ -/* $Id: pjsua_internal.h 2315 2008-09-24 10:10:15Z bennylp $ */ +/* $Id: pjsua_internal.h 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-simple/errno.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/errno.c similarity index 96% rename from libs/pjproject-1.0/pjsip/src/pjsip-simple/errno.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-simple/errno.c index cb74ffb90f1a2e2561ec819a031d650139ea3a4e..513a2e00997e8b10372c320d5e4b6bb669573fe1 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-simple/errno.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/errno.c @@ -1,5 +1,6 @@ -/* $Id: errno.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: errno.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-simple/evsub.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/evsub.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip-simple/evsub.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-simple/evsub.c index e67599e3709377b334beb323e7a68d594ad2ffc8..5fe7466883812886ae0d964595c1f8784e165f24 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-simple/evsub.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/evsub.c @@ -1,5 +1,6 @@ -/* $Id: evsub.c 2149 2008-07-17 13:53:41Z bennylp $ */ +/* $Id: evsub.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-simple/evsub_msg.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/evsub_msg.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip-simple/evsub_msg.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-simple/evsub_msg.c index c28df7b59c34d27ef9528fd40c83f04544ffa9e3..940845ff425032046c01e3c31503ec0b4fd7b0bc 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-simple/evsub_msg.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/evsub_msg.c @@ -1,5 +1,6 @@ -/* $Id: evsub_msg.c 2149 2008-07-17 13:53:41Z bennylp $ */ +/* $Id: evsub_msg.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-simple/iscomposing.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/iscomposing.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip-simple/iscomposing.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-simple/iscomposing.c index 66aa4c4ce30248d8a466663e054de496b0669c05..24068dfd68b4b069c455d9eb6c7b87c09384164d 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-simple/iscomposing.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/iscomposing.c @@ -1,5 +1,6 @@ -/* $Id: iscomposing.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: iscomposing.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-simple/pidf.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/pidf.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip-simple/pidf.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-simple/pidf.c index 64f49264593ce303e9083e3552ebceebe865ce1f..b7e533175633d4ae909c8811826e894ad02a8c06 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-simple/pidf.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/pidf.c @@ -1,5 +1,6 @@ -/* $Id: pidf.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: pidf.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-simple/presence.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/presence.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip-simple/presence.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-simple/presence.c index ad663a688f25fde1f55e8046c263fb6e0c2625b3..01d2a9f0433918bbd90bfe4e5b0ec8411181f60e 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-simple/presence.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/presence.c @@ -1,5 +1,6 @@ -/* $Id: presence.c 2149 2008-07-17 13:53:41Z bennylp $ */ +/* $Id: presence.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-simple/presence_body.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/presence_body.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip-simple/presence_body.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-simple/presence_body.c index c31e0a616e63fcdf419fdb807219b86b80fc2231..32be5cdf4a5229942f7965d12a5a2ded0a88ef70 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-simple/presence_body.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/presence_body.c @@ -1,5 +1,6 @@ -/* $Id: presence_body.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: presence_body.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-simple/publishc.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/publishc.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip-simple/publishc.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-simple/publishc.c index 096ca37be6994a88f83f77b6f34cf18ff8e92977..c3b3411d426f67aa361514836735d34b375d977f 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-simple/publishc.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/publishc.c @@ -1,5 +1,6 @@ -/* $Id: publishc.c 2131 2008-07-13 13:12:36Z bennylp $ */ +/* $Id: publishc.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-simple/rpid.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/rpid.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip-simple/rpid.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-simple/rpid.c index e8465bb450f88e99bb370a8004f73f1db518ef4c..615d3915a3b3b3cd35211224208c24d00c03df1e 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-simple/rpid.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/rpid.c @@ -1,5 +1,6 @@ -/* $Id: rpid.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: rpid.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-simple/xpidf.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/xpidf.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip-simple/xpidf.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-simple/xpidf.c index a081c7cf16cab5ffe19742b92dfddb3a224cae64..f6892b42ad10505877bf8ae719bb6164c168c303 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-simple/xpidf.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/xpidf.c @@ -1,5 +1,6 @@ -/* $Id: xpidf.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: xpidf.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_100rel.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_100rel.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_100rel.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_100rel.c index 29134a1ed0b2cb45c9b3e59c290adab84f3b38e5..6ff45ff38346663b37ade80c8655d4d1066a2ec4 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_100rel.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_100rel.c @@ -1,5 +1,6 @@ -/* $Id: sip_100rel.c 2271 2008-09-11 08:00:47Z bennylp $ */ +/* $Id: sip_100rel.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_inv.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_inv.c similarity index 87% rename from libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_inv.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_inv.c index f54954a7cb9f2e707dccd1c6a9f3a7bf899ddbb9..a676e5addaf67ef52d5a2a8dddb2b547a932fb9d 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_inv.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_inv.c @@ -1,5 +1,6 @@ -/* $Id: sip_inv.c 2306 2008-09-22 14:36:00Z bennylp $ */ +/* $Id: sip_inv.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -142,8 +143,10 @@ static struct mod_inv /* Invite session data to be attached to transaction. */ struct tsx_inv_data { - pjsip_inv_session *inv; - pj_bool_t sdp_done; + pjsip_inv_session *inv; /* The invite session */ + pj_bool_t sdp_done; /* SDP negotiation done for this tsx? */ + pj_str_t done_tag; /* To tag in RX response with answer */ + pj_bool_t done_early;/* Negotiation was done for early med? */ }; /* @@ -223,6 +226,10 @@ void inv_set_state(pjsip_inv_session *inv, pjsip_inv_state state, pjsip_tx_data_dec_ref(inv->last_ack); inv->last_ack = NULL; } + if (inv->invite_req) { + pjsip_tx_data_dec_ref(inv->invite_req); + inv->invite_req = NULL; + } pjsip_100rel_end_session(inv); pjsip_dlg_dec_session(inv->dlg, &mod_inv.mod); } @@ -1217,6 +1224,35 @@ PJ_DEF(pj_status_t) pjsip_inv_terminate( pjsip_inv_session *inv, } +/* + * Restart UAC session, possibly because app or us wants to re-send the + * INVITE request due to 401/407 challenge or 3xx response. + */ +PJ_DEF(pj_status_t) pjsip_inv_uac_restart(pjsip_inv_session *inv, + pj_bool_t new_offer) +{ + PJ_ASSERT_RETURN(inv, PJ_EINVAL); + + inv->state = PJSIP_INV_STATE_NULL; + inv->invite_tsx = NULL; + if (inv->last_answer) { + pjsip_tx_data_dec_ref(inv->last_answer); + inv->last_answer = NULL; + } + + if (new_offer && inv->neg) { + pjmedia_sdp_neg_state neg_state; + + neg_state = pjmedia_sdp_neg_get_state(inv->neg); + if (neg_state == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER) { + pjmedia_sdp_neg_cancel_offer(inv->neg); + } + } + + return PJ_SUCCESS; +} + + static void *clone_sdp(pj_pool_t *pool, const void *data, unsigned len) { PJ_UNUSED_ARG(len); @@ -1407,26 +1443,7 @@ static pj_status_t inv_check_sdp_in_incoming_msg( pjsip_inv_session *inv, static const pj_str_t str_sdp = { "sdp", 3 }; pj_status_t status; pjsip_msg *msg; - pjmedia_sdp_session *sdp; - - /* Get/attach invite session's transaction data */ - tsx_inv_data = (struct tsx_inv_data*) tsx->mod_data[mod_inv.mod.id]; - if (tsx_inv_data == NULL) { - tsx_inv_data = PJ_POOL_ZALLOC_T(tsx->pool, struct tsx_inv_data); - tsx_inv_data->inv = inv; - tsx->mod_data[mod_inv.mod.id] = tsx_inv_data; - } - - /* MUST NOT do multiple SDP offer/answer in a single transaction. - */ - - if (tsx_inv_data->sdp_done) { - if (rdata->msg_info.msg->body) { - PJ_LOG(4,(inv->obj_name, "SDP negotiation done, message " - "body is ignored")); - } - return PJ_SUCCESS; - } + pjmedia_sdp_session *rem_sdp; /* Check if SDP is present in the message. */ @@ -1443,13 +1460,76 @@ static pj_status_t inv_check_sdp_in_incoming_msg( pjsip_inv_session *inv, return PJMEDIA_SDP_EINSDP; } + /* Get/attach invite session's transaction data */ + tsx_inv_data = (struct tsx_inv_data*) tsx->mod_data[mod_inv.mod.id]; + if (tsx_inv_data == NULL) { + tsx_inv_data = PJ_POOL_ZALLOC_T(tsx->pool, struct tsx_inv_data); + tsx_inv_data->inv = inv; + tsx->mod_data[mod_inv.mod.id] = tsx_inv_data; + } + + /* MUST NOT do multiple SDP offer/answer in a single transaction, + * EXCEPT if: + * - this is an initial UAC INVITE transaction (i.e. not re-INVITE), and + * - the previous negotiation was done on an early media (18x) and + * this response is a final/2xx response, and + * - the 2xx response has different To tag than the 18x response + * (i.e. the request has forked). + * + * The exception above is to add a rudimentary support for early media + * forking (sample case: custom ringback). See this ticket for more + * info: http://trac.pjsip.org/repos/ticket/657 + */ + if (tsx_inv_data->sdp_done) { + pj_str_t res_tag; + + res_tag = rdata->msg_info.to->tag; + + /* Allow final response after SDP has been negotiated in early + * media, IF this response is a final response with different + * tag. + */ + if (tsx->role == PJSIP_ROLE_UAC && + rdata->msg_info.msg->line.status.code/100 == 2 && + tsx_inv_data->done_early && + pj_strcmp(&tsx_inv_data->done_tag, &res_tag)) + { + const pjmedia_sdp_session *reoffer_sdp = NULL; + + PJ_LOG(4,(inv->obj_name, "Received forked final response " + "after SDP negotiation has been done in early " + "media. Renegotiating SDP..")); + + /* Retrieve original SDP offer from INVITE request */ + reoffer_sdp = (const pjmedia_sdp_session*) + tsx->last_tx->msg->body->data; + + /* Feed the original offer to negotiator */ + status = pjmedia_sdp_neg_modify_local_offer(inv->pool, inv->neg, + reoffer_sdp); + if (status != PJ_SUCCESS) { + PJ_LOG(1,(inv->obj_name, "Error updating local offer for " + "forked 2xx response (err=%d)", status)); + return status; + } + + } else { + + if (rdata->msg_info.msg->body) { + PJ_LOG(4,(inv->obj_name, "SDP negotiation done, message " + "body is ignored")); + } + return PJ_SUCCESS; + } + } + /* Parse the SDP body. */ status = pjmedia_sdp_parse(rdata->tp_info.pool, (char*)msg->body->data, - msg->body->len, &sdp); + msg->body->len, &rem_sdp); if (status == PJ_SUCCESS) - status = pjmedia_sdp_validate(sdp); + status = pjmedia_sdp_validate(rem_sdp); if (status != PJ_SUCCESS) { char errmsg[PJ_ERR_MSG_SIZE]; @@ -1472,9 +1552,10 @@ static pj_status_t inv_check_sdp_in_incoming_msg( pjsip_inv_session *inv, if (inv->neg == NULL) { status=pjmedia_sdp_neg_create_w_remote_offer(inv->pool, NULL, - sdp, &inv->neg); + rem_sdp, &inv->neg); } else { - status=pjmedia_sdp_neg_set_remote_offer(inv->pool, inv->neg, sdp); + status=pjmedia_sdp_neg_set_remote_offer(inv->pool, inv->neg, + rem_sdp); } if (status != PJ_SUCCESS) { @@ -1489,13 +1570,14 @@ static pj_status_t inv_check_sdp_in_incoming_msg( pjsip_inv_session *inv, if (mod_inv.cb.on_rx_offer && inv->notify) { - (*mod_inv.cb.on_rx_offer)(inv, sdp); + (*mod_inv.cb.on_rx_offer)(inv, rem_sdp); } } else if (pjmedia_sdp_neg_get_state(inv->neg) == PJMEDIA_SDP_NEG_STATE_LOCAL_OFFER) { + int status_code; /* This is an answer. * Process and negotiate remote answer. @@ -1504,7 +1586,8 @@ static pj_status_t inv_check_sdp_in_incoming_msg( pjsip_inv_session *inv, PJ_LOG(5,(inv->obj_name, "Got SDP answer in %s", pjsip_rx_data_get_info(rdata))); - status = pjmedia_sdp_neg_set_remote_answer(inv->pool, inv->neg, sdp); + status = pjmedia_sdp_neg_set_remote_answer(inv->pool, inv->neg, + rem_sdp); if (status != PJ_SUCCESS) { char errmsg[PJ_ERR_MSG_SIZE]; @@ -1518,9 +1601,15 @@ static pj_status_t inv_check_sdp_in_incoming_msg( pjsip_inv_session *inv, inv_negotiate_sdp(inv); - /* Mark this transaction has having SDP offer/answer done. */ + /* Mark this transaction has having SDP offer/answer done, and + * save the reference to the To tag + */ tsx_inv_data->sdp_done = 1; + status_code = rdata->msg_info.msg->line.status.code; + tsx_inv_data->done_early = (status_code/100==1); + pj_strdup(tsx->pool, &tsx_inv_data->done_tag, + &rdata->msg_info.to->tag); } else { @@ -1836,6 +1925,203 @@ PJ_DEF(pj_status_t) pjsip_inv_end_session( pjsip_inv_session *inv, return PJ_SUCCESS; } +/* Following redirection recursion, get next target from the target set and + * notify user. + * + * Returns PJ_FALSE if recursion fails (either because there's no more target + * or user rejects the recursion). If we return PJ_FALSE, caller should + * disconnect the session. + * + * Note: + * the event 'e' argument may be NULL. + */ +static pj_bool_t inv_uac_recurse(pjsip_inv_session *inv, int code, + const pj_str_t *reason, pjsip_event *e) +{ + pjsip_redirect_op op; + pjsip_target *target; + + /* Won't redirect if the callback is not implemented. */ + if (mod_inv.cb.on_redirected == NULL) + return PJ_FALSE; + + if (reason == NULL) + reason = pjsip_get_status_text(code); + + /* Set status of current target */ + pjsip_target_assign_status(inv->dlg->target_set.current, inv->dlg->pool, + code, reason); + + /* Fetch next target from the target set. We only want to + * process SIP/SIPS URI for now. + */ + for (;;) { + target = pjsip_target_set_get_next(&inv->dlg->target_set); + if (target == NULL) { + /* No more target. */ + return PJ_FALSE; + } + + if (!PJSIP_URI_SCHEME_IS_SIP(target->uri) && + !PJSIP_URI_SCHEME_IS_SIPS(target->uri)) + { + code = PJSIP_SC_UNSUPPORTED_URI_SCHEME; + reason = pjsip_get_status_text(code); + + /* Mark this target as unusable and fetch next target. */ + pjsip_target_assign_status(target, inv->dlg->pool, code, reason); + } else { + /* Found a target */ + break; + } + } + + /* We have target in 'target'. Set this target as current target + * and notify callback. + */ + pjsip_target_set_set_current(&inv->dlg->target_set, target); + + op = (*mod_inv.cb.on_redirected)(inv, target->uri, e); + + + /* Check what the application wants to do now */ + switch (op) { + case PJSIP_REDIRECT_ACCEPT: + case PJSIP_REDIRECT_STOP: + /* Must increment session counter, that's the convention of the + * pjsip_inv_process_redirect(). + */ + pjsip_dlg_inc_session(inv->dlg, &mod_inv.mod); + + /* Act on the recursion */ + pjsip_inv_process_redirect(inv, op, e); + return PJ_TRUE; + + case PJSIP_REDIRECT_PENDING: + /* Increment session so that the dialog/session is not destroyed + * while we're waiting for user confirmation. + */ + pjsip_dlg_inc_session(inv->dlg, &mod_inv.mod); + + /* Also clear the invite_tsx variable, otherwise when this tsx is + * terminated, it will also terminate the session. + */ + inv->invite_tsx = NULL; + + /* Done. The processing will continue once the application calls + * pjsip_inv_process_redirect(). + */ + return PJ_TRUE; + + case PJSIP_REDIRECT_REJECT: + /* Recursively call this function again to fetch next target, if any. + */ + return inv_uac_recurse(inv, PJSIP_SC_REQUEST_TERMINATED, NULL, e); + + } + + pj_assert(!"Should not reach here"); + return PJ_FALSE; +} + + +/* Process redirection/recursion */ +PJ_DEF(pj_status_t) pjsip_inv_process_redirect( pjsip_inv_session *inv, + pjsip_redirect_op op, + pjsip_event *e) +{ + const pjsip_status_code cancel_code = PJSIP_SC_REQUEST_TERMINATED; + pjsip_event usr_event; + pj_status_t status = PJ_SUCCESS; + + PJ_ASSERT_RETURN(inv && op != PJSIP_REDIRECT_PENDING, PJ_EINVAL); + + if (e == NULL) { + PJSIP_EVENT_INIT_USER(usr_event, NULL, NULL, NULL, NULL); + e = &usr_event; + } + + pjsip_dlg_inc_lock(inv->dlg); + + /* Decrement session. That's the convention here to prevent the dialog + * or session from being destroyed while we're waiting for user + * confirmation. + */ + pjsip_dlg_dec_session(inv->dlg, &mod_inv.mod); + + /* See what the application wants to do now */ + switch (op) { + case PJSIP_REDIRECT_ACCEPT: + /* User accept the redirection. Reset the session and resend the + * INVITE request. + */ + { + pjsip_tx_data *tdata; + pjsip_via_hdr *via; + + /* Get the original INVITE request. */ + tdata = inv->invite_req; + pjsip_tx_data_add_ref(tdata); + + /* Restore strict route set. + * See http://trac.pjsip.org/repos/ticket/492 + */ + pjsip_restore_strict_route_set(tdata); + + /* Set target */ + tdata->msg->line.req.uri = (pjsip_uri*) + pjsip_uri_clone(tdata->pool, inv->dlg->target_set.current->uri); + + /* Remove branch param in Via header. */ + via = (pjsip_via_hdr*) + pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL); + via->branch_param.slen = 0; + + /* Must invalidate the message! */ + pjsip_tx_data_invalidate_msg(tdata); + + /* Reset the session */ + pjsip_inv_uac_restart(inv, PJ_FALSE); + + /* (re)Send the INVITE request */ + status = pjsip_inv_send_msg(inv, tdata); + } + break; + + case PJSIP_REDIRECT_STOP: + /* User doesn't want the redirection. Disconnect the session now. */ + inv_set_cause(inv, cancel_code, pjsip_get_status_text(cancel_code)); + inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e); + + /* Caller should expect that the invite session is gone now, so + * we don't need to set status to PJSIP_ESESSIONTERMINATED here. + */ + break; + + case PJSIP_REDIRECT_REJECT: + /* Current target is rejected. Fetch next target if any. */ + if (inv_uac_recurse(inv, cancel_code, NULL, NULL) == PJ_FALSE) { + inv_set_cause(inv, cancel_code, + pjsip_get_status_text(cancel_code)); + inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e); + + /* Tell caller that the invite session is gone now */ + status = PJSIP_ESESSIONTERMINATED; + } + break; + + + case PJSIP_REDIRECT_PENDING: + pj_assert(!"Should not happen"); + break; + } + + + pjsip_dlg_dec_lock(inv->dlg); + + return status; +} + /* * Create re-INVITE. @@ -2497,6 +2783,19 @@ static void inv_on_state_null( pjsip_inv_session *inv, pjsip_event *e) if (dlg->role == PJSIP_ROLE_UAC) { + /* Save the original INVITE request, if on_redirected() callback + * is implemented. We may need to resend the INVITE if we receive + * redirection response. + */ + if (mod_inv.cb.on_redirected) { + if (inv->invite_req) { + pjsip_tx_data_dec_ref(inv->invite_req); + inv->invite_req = NULL; + } + inv->invite_req = tsx->last_tx; + pjsip_tx_data_add_ref(inv->invite_req); + } + switch (tsx->state) { case PJSIP_TSX_STATE_CALLING: inv_set_state(inv, PJSIP_INV_STATE_CALLING, e); @@ -2516,6 +2815,11 @@ static void inv_on_state_null( pjsip_inv_session *inv, pjsip_event *e) if (tsx->status_code > 100) inv_set_state(inv, PJSIP_INV_STATE_EARLY, e); break; + case PJSIP_TSX_STATE_TERMINATED: + /* there is a failure in sending response. */ + inv_set_cause(inv, tsx->status_code, &tsx->status_text); + inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e); + break; default: inv_on_state_incoming(inv, e); break; @@ -2618,6 +2922,105 @@ static pj_bool_t handle_uac_tsx_response(pjsip_inv_session *inv, } +/* Handle call rejection, especially with regard to processing call + * redirection. We need to handle the following scenarios: + * - 3xx response is received -- see if on_redirected() callback is + * implemented. If so, add the Contact URIs in the response to the + * target set and notify user. + * - 4xx - 6xx resposne is received -- see if we're currently recursing, + * if so fetch the next target if any and notify the on_redirected() + * callback. + * - for other cases -- disconnect the session. + */ +static void handle_uac_call_rejection(pjsip_inv_session *inv, pjsip_event *e) +{ + pjsip_transaction *tsx = e->body.tsx_state.tsx; + pj_status_t status; + + if (PJSIP_IS_STATUS_IN_CLASS(tsx->status_code, 300)) { + + if (mod_inv.cb.on_redirected == NULL) { + + /* Redirection callback is not implemented, disconnect the + * call. + */ + goto terminate_session; + + } else { + const pjsip_msg *res_msg; + + res_msg = e->body.tsx_state.src.rdata->msg_info.msg; + + /* Gather all Contact URI's in the response and add them + * to target set. The function will take care of removing + * duplicate URI's. + */ + pjsip_target_set_add_from_msg(&inv->dlg->target_set, + inv->dlg->pool, res_msg); + + /* Recurse to alternate targets if application allows us */ + if (!inv_uac_recurse(inv, tsx->status_code, &tsx->status_text, e)) + { + /* Recursion fails, terminate session now */ + goto terminate_session; + } + + /* Done */ + } + + } else if ((tsx->status_code==401 || tsx->status_code==407) && + !inv->cancelling) + { + + /* Handle authentication failure: + * Resend the request with Authorization header. + */ + pjsip_tx_data *tdata; + + status = pjsip_auth_clt_reinit_req(&inv->dlg->auth_sess, + e->body.tsx_state.src.rdata, + tsx->last_tx, + &tdata); + + if (status != PJ_SUCCESS) { + + /* Does not have proper credentials. If we are currently + * recursing, try the next target. Otherwise end the session. + */ + if (!inv_uac_recurse(inv, tsx->status_code, &tsx->status_text, e)) + { + /* Recursion fails, terminate session now */ + goto terminate_session; + } + + } else { + + /* Restart session. */ + pjsip_inv_uac_restart(inv, PJ_FALSE); + + /* Send the request. */ + status = pjsip_inv_send_msg(inv, tdata); + } + + } else if (PJSIP_IS_STATUS_IN_CLASS(tsx->status_code, 600)) { + /* Global error */ + goto terminate_session; + + } else { + /* See if we have alternate target to try */ + if (!inv_uac_recurse(inv, tsx->status_code, &tsx->status_text, e)) { + /* Recursion fails, terminate session now */ + goto terminate_session; + } + } + return; + +terminate_session: + inv_set_cause(inv, tsx->status_code, &tsx->status_text); + inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e); +} + + /* * State CALLING is after sending initial INVITE request but before * any response (with tag) is received. @@ -2680,47 +3083,8 @@ static void inv_on_state_calling( pjsip_inv_session *inv, pjsip_event *e) inv_check_sdp_in_incoming_msg(inv, tsx, e->body.tsx_state.src.rdata); - } else if ((tsx->status_code==401 || tsx->status_code==407) && - !inv->cancelling) - { - - /* Handle authentication failure: - * Resend the request with Authorization header. - */ - pjsip_tx_data *tdata; - - status = pjsip_auth_clt_reinit_req(&inv->dlg->auth_sess, - e->body.tsx_state.src.rdata, - tsx->last_tx, - &tdata); - - if (status != PJ_SUCCESS) { - - /* Does not have proper credentials. - * End the session. - */ - inv_set_cause(inv, tsx->status_code, &tsx->status_text); - inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e); - - } else { - - /* Restart session. */ - inv->state = PJSIP_INV_STATE_NULL; - inv->invite_tsx = NULL; - if (inv->last_answer) { - pjsip_tx_data_dec_ref(inv->last_answer); - inv->last_answer = NULL; - } - - /* Send the request. */ - status = pjsip_inv_send_msg(inv, tdata); - } - } else { - - inv_set_cause(inv, tsx->status_code, &tsx->status_text); - inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e); - + handle_uac_call_rejection(inv, e); } break; @@ -2887,6 +3251,10 @@ static void inv_on_state_early( pjsip_inv_session *inv, pjsip_event *e) e->body.tsx_state.src.rdata); } + } else if (tsx->role == PJSIP_ROLE_UAC) { + + handle_uac_call_rejection(inv, e); + } else { inv_set_cause(inv, tsx->status_code, &tsx->status_text); inv_set_state(inv, PJSIP_INV_STATE_DISCONNECTED, e); diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_reg.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_reg.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_reg.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_reg.c index 8e05266952f48dd516c498dbaa8f0193cb608743..8f16d7d64f808b95ed2ee49e06241d9723010fb4 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_reg.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_reg.c @@ -1,5 +1,6 @@ -/* $Id: sip_reg.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_reg.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_replaces.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_replaces.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_replaces.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_replaces.c index c9d1e2dcb4ed3b2ea091cd2b5eeff2893760126c..2b7f16521c812dfb9fe390deeaa7ffff3db3f462 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_replaces.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_replaces.c @@ -1,5 +1,6 @@ -/* $Id: sip_replaces.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_replaces.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_xfer.c b/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_xfer.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_xfer.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_xfer.c index 9697117c3be1b8da185e85e31c8337b80ea231b1..7fc277bcc8f5d52004d015a7fc9b3607128563e7 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip-ua/sip_xfer.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_xfer.c @@ -1,5 +1,6 @@ -/* $Id: sip_xfer.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_xfer.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_aka.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_aka.c similarity index 97% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_aka.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_aka.c index 12e98eea4ca8b5341eb3cda0b22a84e22a6de717..d79398be416f9720a5c4896e1e4e900256bb154e 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_aka.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_aka.c @@ -1,5 +1,6 @@ -/* $Id: sip_auth_aka.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_auth_aka.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_client.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_client.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_client.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_client.c index f5d096480a94cc913b3467ecef46f2ef04ce2935..ea0b8e471ef90d3a5299a6b9aadb0213e0770330 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_client.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_client.c @@ -1,5 +1,6 @@ -/* $Id: sip_auth_client.c 2314 2008-09-24 09:51:51Z bennylp $ */ +/* $Id: sip_auth_client.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_msg.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_msg.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_msg.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_msg.c index e3d8e07de0e7f7709b82fae34ac84de8ec7e7c92..746aea85cb76ab77374fe04159141909eabc0087 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_msg.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_msg.c @@ -1,5 +1,6 @@ -/* $Id: sip_auth_msg.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_auth_msg.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_parser.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_parser.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_parser.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_parser.c index 6ae0db596e408db3eb2979a6eb91f84100c891a3..0a20a5073372b8673f0901f5d5f4c2b18a6c0dc8 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_parser.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_parser.c @@ -1,5 +1,6 @@ -/* $Id: sip_auth_parser.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_auth_parser.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_server.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_server.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_server.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_server.c index f7cbdd7e3eaeb829c6ddaf8dcd5c531702733211..1a557d7a12d49b112e68c561eabfb0b7e4df07e8 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_auth_server.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_server.c @@ -1,5 +1,6 @@ -/* $Id: sip_auth_server.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_auth_server.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_config.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_config.c similarity index 91% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_config.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_config.c index 4fd71f48dedd25aca74629c0d669a5da882d3e47..6df63e402255920a9a911a1f03448b9b20b42d45 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_config.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_config.c @@ -1,5 +1,6 @@ -/* $Id: sip_config.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_config.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_dialog.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_dialog.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_dialog.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_dialog.c index 4b42b33b50bb508dbe903e6263c84a690cab8940..a7a74d1642d96bf54214f950cdec005b77683db1 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_dialog.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_dialog.c @@ -1,5 +1,6 @@ -/* $Id: sip_dialog.c 2315 2008-09-24 10:10:15Z bennylp $ */ +/* $Id: sip_dialog.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -91,6 +92,7 @@ static pj_status_t create_dialog( pjsip_user_agent *ua, if (status != PJ_SUCCESS) goto on_error; + pjsip_target_set_init(&dlg->target_set); *p_dlg = dlg; return PJ_SUCCESS; @@ -182,6 +184,9 @@ PJ_DEF(pj_status_t) pjsip_dlg_create_uac( pjsip_user_agent *ua, pj_list_init(&uri->header_param); } + /* Add target to the target set */ + pjsip_target_set_add_uri(&dlg->target_set, dlg->pool, dlg->target, 0); + /* Init local info. */ dlg->local.info = pjsip_from_hdr_create(dlg->pool); pj_strdup_with_null(dlg->pool, &dlg->local.info_str, local_uri); @@ -536,6 +541,7 @@ PJ_DEF(pj_status_t) pjsip_dlg_create_uas( pjsip_user_agent *ua, on_error: if (tsx) { pjsip_tsx_terminate(tsx, 500); + pj_assert(dlg->tsx_count>0); --dlg->tsx_count; } @@ -1408,6 +1414,14 @@ PJ_DEF(pj_status_t) pjsip_dlg_send_response( pjsip_dialog *dlg, /* Ask transaction to send the response */ status = pjsip_tsx_send_msg(tsx, tdata); + /* This function must decrement transmit data request counter + * regardless of the operation status. The transaction only + * decrements the counter if the operation is successful. + */ + if (status != PJ_SUCCESS) { + pjsip_tx_data_dec_ref(tdata); + } + pjsip_dlg_dec_lock(dlg); return status; @@ -1894,7 +1908,14 @@ void pjsip_dlg_on_tsx_state( pjsip_dialog *dlg, } - if (tsx->state == PJSIP_TSX_STATE_TERMINATED) { + /* It is possible that the transaction is terminated and this function + * is called while we're calling on_tsx_state(). So only decrement + * the tsx_count if we're still attached to the transaction. + */ + if (tsx->state == PJSIP_TSX_STATE_TERMINATED && + tsx->mod_data[dlg->ua->id] == dlg) + { + pj_assert(dlg->tsx_count>0); --dlg->tsx_count; tsx->mod_data[dlg->ua->id] = NULL; } diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_endpoint.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_endpoint.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_endpoint.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_endpoint.c index 5134c5e195810582cb51f5521b459b8d3fdd2811..9d4daad882513d2602fea18d8fd34121f4d7af9d 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_endpoint.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_endpoint.c @@ -1,5 +1,6 @@ -/* $Id: sip_endpoint.c 2226 2008-08-19 16:18:02Z bennylp $ */ +/* $Id: sip_endpoint.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_errno.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_errno.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_errno.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_errno.c index 4f0b949f611df0c00a049b5896c8de4bd59bd0b0..3460b78eadb7566b60ca4b32cf7175ea8d30da73 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_errno.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_errno.c @@ -1,5 +1,6 @@ -/* $Id: sip_errno.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_errno.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_msg.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_msg.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_msg.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_msg.c index 6b65595a7368439f6865026a75a89a64475e0fa9..0c1b7ba9b381aa473980a3fe5c56d21f349f820e 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_msg.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_msg.c @@ -1,5 +1,6 @@ -/* $Id: sip_msg.c 2146 2008-07-16 12:31:57Z bennylp $ */ +/* $Id: sip_msg.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_parser.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_parser.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_parser.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_parser.c index 5ae3ff381e8bfcf131e529af90ee413316feda82..31cfa1a4f4a7f8051a60e18f6307371f13bdf42b 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_parser.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_parser.c @@ -1,5 +1,6 @@ -/* $Id: sip_parser.c 2193 2008-08-05 19:28:17Z bennylp $ */ +/* $Id: sip_parser.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_resolve.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_resolve.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_resolve.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_resolve.c index f197eae7e318c8e2fb0e71ea14803fccf316ac86..3c9e610af87da4540fc32d37ecb45a594919ac4f 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_resolve.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_resolve.c @@ -1,5 +1,6 @@ -/* $Id: sip_resolve.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_resolve.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_tel_uri.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_tel_uri.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_tel_uri.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_tel_uri.c index e27e9c463650df34248ddaba931599c2a28e53fb..73a56385109228f0ecf7a0d7e069b7411b34f4be 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_tel_uri.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_tel_uri.c @@ -1,5 +1,6 @@ -/* $Id: sip_tel_uri.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_tel_uri.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transaction.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transaction.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_transaction.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transaction.c index adefc67dcff297ac54e88bcbb43327bc2e748b49..a25abb9317d4dca01470b9f6b491987f70dad138 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transaction.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transaction.c @@ -1,5 +1,6 @@ -/* $Id: sip_transaction.c 2128 2008-07-12 21:22:35Z bennylp $ */ +/* $Id: sip_transaction.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transport.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_transport.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport.c index 8b3cbe581e6c1eb2a9c98005790dccc8ad801b94..085358d9b4bc91a4ce13b04ca6848ee1a9da3c42 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transport.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport.c @@ -1,5 +1,6 @@ -/* $Id: sip_transport.c 2180 2008-07-28 20:17:04Z bennylp $ */ +/* $Id: sip_transport.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -568,8 +569,17 @@ static pj_status_t mod_on_tx_msg(pjsip_tx_data *tdata) { /* Allocate buffer if necessary. */ if (tdata->buf.start == NULL) { - tdata->buf.start = (char*) - pj_pool_alloc( tdata->pool, PJSIP_MAX_PKT_LEN); + PJ_USE_EXCEPTION; + + PJ_TRY { + tdata->buf.start = (char*) + pj_pool_alloc(tdata->pool, PJSIP_MAX_PKT_LEN); + } + PJ_CATCH_ANY { + return PJ_ENOMEM; + } + PJ_END + tdata->buf.cur = tdata->buf.start; tdata->buf.end = tdata->buf.start + PJSIP_MAX_PKT_LEN; } diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_loop.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_loop.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_loop.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_loop.c index fddcf49a56efb50ae170553e06e62b57f520c602..e509d4b0988d03383066e7f4940bf9f28dfb4a4b 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_loop.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_loop.c @@ -1,5 +1,6 @@ -/* $Id: sip_transport_loop.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_transport_loop.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_tcp.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_tcp.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_tcp.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_tcp.c index cc912b136045baf8793cb8aecb7837c3f9cb2d35..042f192528cf30f934b634531459801ed42ddb88 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_tcp.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_tcp.c @@ -1,5 +1,6 @@ -/* $Id: sip_transport_tcp.c 2188 2008-08-04 10:52:51Z bennylp $ */ +/* $Id: sip_transport_tcp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_tls_ossl.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_tls_ossl.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_tls_ossl.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_tls_ossl.c index c9a1a910360ab4d57c442570ef6c8ec40616dfcf..4d04b130eed76ce128eeabbd36b48193b758ce90 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_tls_ossl.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_tls_ossl.c @@ -1,5 +1,6 @@ -/* $Id: sip_transport_tls_ossl.c 2180 2008-07-28 20:17:04Z bennylp $ */ +/* $Id: sip_transport_tls_ossl.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_udp.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_udp.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_udp.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_udp.c index 463f17ec8f015d023e6ceee4e59b1ccd02a183e5..b0215189ddd96e135cb5e7e1969e013d3fbb428a 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_transport_udp.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_udp.c @@ -1,5 +1,6 @@ -/* $Id: sip_transport_udp.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_transport_udp.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_ua_layer.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_ua_layer.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_ua_layer.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_ua_layer.c index 1b3b1ada313cfd67e0faa59b4d9ed03f01340b08..90b41696963f9731a02b8166edd20f63a5083ecc 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_ua_layer.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_ua_layer.c @@ -1,5 +1,6 @@ -/* $Id: sip_ua_layer.c 2315 2008-09-24 10:10:15Z bennylp $ */ +/* $Id: sip_ua_layer.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_uri.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_uri.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_uri.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_uri.c index 3fe0c07cf4a7fbb2017d957d1578ea77897fe730..afdd0c8f4048727ff43b335854e8848143353434 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_uri.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_uri.c @@ -1,5 +1,6 @@ -/* $Id: sip_uri.c 2205 2008-08-12 10:55:28Z bennylp $ */ +/* $Id: sip_uri.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_util.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util.c similarity index 93% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_util.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util.c index e0aa7e8ea33d86cb5239641b032847f0376fd973..b0339e36406cdd2e014c441d791ff6447572c637 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_util.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util.c @@ -1,5 +1,6 @@ -/* $Id: sip_util.c 2103 2008-07-04 23:49:44Z bennylp $ */ +/* $Id: sip_util.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -49,6 +50,139 @@ static const char *event_str[] = static pj_str_t str_TEXT = { "text", 4}, str_PLAIN = { "plain", 5 }; +/* Add URI to target-set */ +PJ_DEF(pj_status_t) pjsip_target_set_add_uri( pjsip_target_set *tset, + pj_pool_t *pool, + const pjsip_uri *uri, + int q1000) +{ + pjsip_target *t, *pos = NULL; + + PJ_ASSERT_RETURN(tset && pool && uri, PJ_EINVAL); + + /* Set q-value to 1 if it is not set */ + if (q1000 <= 0) + q1000 = 1000; + + /* Scan all the elements to see for duplicates, and at the same time + * get the position where the new element should be inserted to + * based on the q-value. + */ + t = tset->head.next; + while (t != &tset->head) { + if (pjsip_uri_cmp(PJSIP_URI_IN_REQ_URI, t->uri, uri)==PJ_SUCCESS) + return PJ_EEXISTS; + if (pos==NULL && t->q1000 < q1000) + pos = t; + t = t->next; + } + + /* Create new element */ + t = PJ_POOL_ZALLOC_T(pool, pjsip_target); + t->uri = (pjsip_uri*)pjsip_uri_clone(pool, uri); + t->q1000 = q1000; + + /* Insert */ + if (pos == NULL) + pj_list_push_back(&tset->head, t); + else + pj_list_insert_before(pos, t); + + /* Set current target if this is the first URI */ + if (tset->current == NULL) + tset->current = t; + + return PJ_SUCCESS; +} + +/* Add URI's in the Contact header in the message to target-set */ +PJ_DEF(pj_status_t) pjsip_target_set_add_from_msg( pjsip_target_set *tset, + pj_pool_t *pool, + const pjsip_msg *msg) +{ + const pjsip_hdr *hdr; + unsigned added = 0; + + PJ_ASSERT_RETURN(tset && pool && msg, PJ_EINVAL); + + /* Scan for Contact headers and add the URI */ + hdr = msg->hdr.next; + while (hdr != &msg->hdr) { + if (hdr->type == PJSIP_H_CONTACT) { + const pjsip_contact_hdr *cn_hdr = (const pjsip_contact_hdr*)hdr; + + if (!cn_hdr->star) { + pj_status_t rc; + rc = pjsip_target_set_add_uri(tset, pool, cn_hdr->uri, + cn_hdr->q1000); + if (rc == PJ_SUCCESS) + ++added; + } + } + hdr = hdr->next; + } + + return added ? PJ_SUCCESS : PJ_EEXISTS; +} + + +/* Get next target, if any */ +PJ_DEF(pjsip_target*) pjsip_target_set_get_next(const pjsip_target_set *tset) +{ + const pjsip_target *t, *next = NULL; + + t = tset->head.next; + while (t != &tset->head) { + if (PJSIP_IS_STATUS_IN_CLASS(t->code, 200)) { + /* No more target since one target has been successful */ + return NULL; + } + if (PJSIP_IS_STATUS_IN_CLASS(t->code, 600)) { + /* No more target since one target returned global error */ + return NULL; + } + if (t->code==0 && next==NULL) { + /* This would be the next target as long as we don't find + * targets with 2xx or 6xx status after this. + */ + next = t; + } + t = t->next; + } + + return (pjsip_target*)next; +} + + +/* Set current target */ +PJ_DEF(pj_status_t) pjsip_target_set_set_current( pjsip_target_set *tset, + pjsip_target *target) +{ + PJ_ASSERT_RETURN(tset && target, PJ_EINVAL); + PJ_ASSERT_RETURN(pj_list_find_node(tset, target) != NULL, PJ_ENOTFOUND); + + tset->current = target; + + return PJ_SUCCESS; +} + + +/* Assign status to a target */ +PJ_DEF(pj_status_t) pjsip_target_assign_status( pjsip_target *target, + pj_pool_t *pool, + int status_code, + const pj_str_t *reason) +{ + PJ_ASSERT_RETURN(target && pool && status_code && reason, PJ_EINVAL); + + target->code = (pjsip_status_code)status_code; + pj_strdup(pool, &target->reason, reason); + + return PJ_SUCCESS; +} + + + /* * Initialize transmit data (msg) with the headers and optional body. * This will just put the headers in the message as it is. Be carefull @@ -1540,8 +1674,12 @@ PJ_DEF(pj_status_t) pjsip_endpt_respond_stateless( pjsip_endpoint *endpt, /* Send! */ status = pjsip_endpt_send_response( endpt, &res_addr, tdata, NULL, NULL ); + if (status != PJ_SUCCESS) { + pjsip_tx_data_dec_ref(tdata); + return status; + } - return status; + return PJ_SUCCESS; } diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_util_proxy.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util_proxy.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_util_proxy.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util_proxy.c index 56d5290c187d8d436a5de02d8d9d1e79c3c665b8..a050dfee8b5cd1ba4863f4e353d468d56cdcb794 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_util_proxy.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util_proxy.c @@ -1,5 +1,6 @@ -/* $Id: sip_util_proxy.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_util_proxy.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsip/sip_util_statefull.c b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util_statefull.c similarity index 97% rename from libs/pjproject-1.0/pjsip/src/pjsip/sip_util_statefull.c rename to libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util_statefull.c index b324a2d2d5def789c9b2566927c33d54cb63ec2e..9a6f7402cbec9cd348e350417cd93d9819953550 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsip/sip_util_statefull.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util_statefull.c @@ -1,5 +1,6 @@ -/* $Id: sip_util_statefull.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: sip_util_statefull.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_acc.c b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_acc.c similarity index 98% rename from libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_acc.c rename to libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_acc.c index 96dc7ab42471a1a491d4b14e4639e82cdf71d1b9..806a43751745b33d3e8b4d60a49ed0a6c0223780 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_acc.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_acc.c @@ -1,5 +1,6 @@ -/* $Id: pjsua_acc.c 2325 2008-09-26 22:06:11Z bennylp $ */ +/* $Id: pjsua_acc.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -367,7 +368,7 @@ PJ_DEF(pj_status_t) pjsua_acc_add_local( pjsua_transport_id tid, } /* Don't add transport parameter if it's UDP */ - if ((t->type & PJSIP_TRANSPORT_UDP) == 0) { + if (t->type!=PJSIP_TRANSPORT_UDP && t->type!=PJSIP_TRANSPORT_UDP6) { pj_ansi_snprintf(transport_param, sizeof(transport_param), ";transport=%s", pjsip_transport_get_type_name(t->type)); @@ -681,14 +682,16 @@ static pj_bool_t acc_check_nat_addr(pjsua_acc *acc, tmp = (char*) pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE); len = pj_ansi_snprintf(tmp, PJSIP_MAX_URL_SIZE, - "", + "", (int)acc->user_part.slen, acc->user_part.ptr, (acc->user_part.slen? "@" : ""), (int)via_addr->slen, via_addr->ptr, rport, - tp->type_name); + tp->type_name, + (int)acc->cfg.contact_params.slen, + acc->cfg.contact_params.ptr); if (len < 1) { PJ_LOG(1,(THIS_FILE, "URI too long")); pj_pool_release(pool); @@ -1651,7 +1654,7 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uac_contact( pj_pool_t *pool, } /* Don't add transport parameter if it's UDP */ - if ((tp_type & PJSIP_TRANSPORT_UDP) == 0) { + if (tp_type!=PJSIP_TRANSPORT_UDP && tp_type!=PJSIP_TRANSPORT_UDP6) { pj_ansi_snprintf(transport_param, sizeof(transport_param), ";transport=%s", pjsip_transport_get_type_name(tp_type)); @@ -1663,7 +1666,7 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uac_contact( pj_pool_t *pool, /* Create the contact header */ contact->ptr = (char*)pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE); contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE, - "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s>", + "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>", (int)acc->display.slen, acc->display.ptr, (acc->display.slen?" " : ""), @@ -1676,7 +1679,9 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uac_contact( pj_pool_t *pool, local_addr.ptr, endquote, local_port, - transport_param); + transport_param, + (int)acc->cfg.contact_params.slen, + acc->cfg.contact_params.ptr); return PJ_SUCCESS; } @@ -1801,7 +1806,7 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uas_contact( pj_pool_t *pool, } /* Don't add transport parameter if it's UDP */ - if ((tp_type & PJSIP_TRANSPORT_UDP) == 0) { + if (tp_type!=PJSIP_TRANSPORT_UDP && tp_type!=PJSIP_TRANSPORT_UDP6) { pj_ansi_snprintf(transport_param, sizeof(transport_param), ";transport=%s", pjsip_transport_get_type_name(tp_type)); @@ -1813,7 +1818,7 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uas_contact( pj_pool_t *pool, /* Create the contact header */ contact->ptr = (char*) pj_pool_alloc(pool, PJSIP_MAX_URL_SIZE); contact->slen = pj_ansi_snprintf(contact->ptr, PJSIP_MAX_URL_SIZE, - "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s>", + "%.*s%s<%s:%.*s%s%s%.*s%s:%d%s%.*s>", (int)acc->display.slen, acc->display.ptr, (acc->display.slen?" " : ""), @@ -1826,7 +1831,9 @@ PJ_DEF(pj_status_t) pjsua_acc_create_uas_contact( pj_pool_t *pool, local_addr.ptr, endquote, local_port, - transport_param); + transport_param, + (int)acc->cfg.contact_params.slen, + acc->cfg.contact_params.ptr); return PJ_SUCCESS; } diff --git a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_call.c b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_call.c similarity index 97% rename from libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_call.c rename to libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_call.c index f8a9b2266bd1189b4afe59bc60166ef3ecf36737..55f5d95d7faf853068d88e5d569e89121ad218da 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_call.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_call.c @@ -1,5 +1,6 @@ -/* $Id: pjsua_call.c 2315 2008-09-24 10:10:15Z bennylp $ */ +/* $Id: pjsua_call.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -65,6 +66,13 @@ static void pjsua_call_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_transaction *tsx, pjsip_event *e); +/* + * Redirection handler. + */ +static pjsip_redirect_op pjsua_call_on_redirected(pjsip_inv_session *inv, + const pjsip_uri *target, + const pjsip_event *e); + /* Create SDP for call hold. */ static pj_status_t create_sdp_of_call_hold(pjsua_call *call, @@ -156,7 +164,7 @@ pj_status_t pjsua_call_subsys_init(const pjsua_config *cfg) inv_cb.on_rx_offer = &pjsua_call_on_rx_offer; inv_cb.on_create_offer = &pjsua_call_on_create_offer; inv_cb.on_tsx_state_changed = &pjsua_call_on_tsx_state_changed; - + inv_cb.on_redirected = &pjsua_call_on_redirected; /* Initialize invite session module: */ status = pjsip_inv_usage_init(pjsua_var.endpt, &inv_cb); @@ -902,12 +910,6 @@ pj_bool_t pjsua_call_on_incoming(pjsip_rx_data *rdata) update_remote_nat_type(call, remote_sdp); } - /* Create and attach pjsua_var data to the dialog: */ - call->inv = inv; - - dlg->mod_data[pjsua_var.mod.id] = call; - inv->mod_data[pjsua_var.mod.id] = call; - /* If account is locked to specific transport, then lock dialog * to this transport too. */ @@ -918,7 +920,13 @@ pj_bool_t pjsua_call_on_incoming(pjsip_rx_data *rdata) pjsip_dlg_set_transport(dlg, &tp_sel); } - /* Must answer with some response to initial INVITE. + /* Must answer with some response to initial INVITE. We'll do this before + * attaching the call to the invite session/dialog, so that the application + * will not get notification about this event (on another scenario, it is + * also possible that inv_send_msg() fails and causes the invite session to + * be disconnected. If we have the call attached at this time, this will + * cause the disconnection callback to be called before on_incoming_call() + * callback is called, which is not right). */ status = pjsip_inv_initial_answer(inv, rdata, 100, NULL, NULL, &response); @@ -936,9 +944,17 @@ pj_bool_t pjsua_call_on_incoming(pjsip_rx_data *rdata) status = pjsip_inv_send_msg(inv, response); if (status != PJ_SUCCESS) { pjsua_perror(THIS_FILE, "Unable to send 100 response", status); + PJSUA_UNLOCK(); + return PJ_TRUE; } } + /* Create and attach pjsua_var data to the dialog: */ + call->inv = inv; + + dlg->mod_data[pjsua_var.mod.id] = call; + inv->mod_data[pjsua_var.mod.id] = call; + ++pjsua_var.call_cnt; @@ -1433,6 +1449,32 @@ PJ_DEF(pj_status_t) pjsua_call_hangup(pjsua_call_id call_id, } +/* + * Accept or reject redirection. + */ +PJ_DEF(pj_status_t) pjsua_call_process_redirect( pjsua_call_id call_id, + pjsip_redirect_op cmd) +{ + pjsua_call *call; + pjsip_dialog *dlg; + pj_status_t status; + + PJ_ASSERT_RETURN(call_id>=0 && call_id<(int)pjsua_var.ua_cfg.max_calls, + PJ_EINVAL); + + status = acquire_call("pjsua_call_process_redirect()", call_id, + &call, &dlg); + if (status != PJ_SUCCESS) + return status; + + status = pjsip_inv_process_redirect(call->inv, cmd, NULL); + + pjsip_dlg_dec_lock(dlg); + + return status; +} + + /* * Put the specified call on hold. */ @@ -2827,12 +2869,19 @@ static void pjsua_call_on_state_changed(pjsip_inv_session *inv, pj_gettimeofday(&call->dis_time); if (call->res_time.sec == 0) pj_gettimeofday(&call->res_time); - if (e->body.tsx_state.tsx->status_code > call->last_code) { + if (e->type == PJSIP_EVENT_TSX_STATE && + e->body.tsx_state.tsx->status_code > call->last_code) + { call->last_code = (pjsip_status_code) e->body.tsx_state.tsx->status_code; pj_strncpy(&call->last_text, &e->body.tsx_state.tsx->status_text, sizeof(call->last_text_buf_)); + } else { + call->last_code = PJSIP_SC_REQUEST_TERMINATED; + pj_strncpy(&call->last_text, + pjsip_get_status_text(call->last_code), + sizeof(call->last_text_buf_)); } break; default: @@ -3685,10 +3734,17 @@ static void pjsua_call_on_tsx_state_changed(pjsip_inv_session *inv, pjsip_transaction *tsx, pjsip_event *e) { - pjsua_call *call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id]; + pjsua_call *call; PJSUA_LOCK(); + call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id]; + + if (call == NULL) { + PJSUA_UNLOCK(); + return; + } + /* Notify application callback first */ if (pjsua_var.ua_cfg.cb.on_call_tsx_state) { (*pjsua_var.ua_cfg.cb.on_call_tsx_state)(call->index, tsx, e); @@ -3770,3 +3826,31 @@ static void pjsua_call_on_tsx_state_changed(pjsip_inv_session *inv, PJSUA_UNLOCK(); } + + +/* Redirection handler */ +static pjsip_redirect_op pjsua_call_on_redirected(pjsip_inv_session *inv, + const pjsip_uri *target, + const pjsip_event *e) +{ + pjsua_call *call = (pjsua_call*) inv->dlg->mod_data[pjsua_var.mod.id]; + pjsip_redirect_op op; + + PJSUA_LOCK(); + + if (pjsua_var.ua_cfg.cb.on_call_redirected) { + op = (*pjsua_var.ua_cfg.cb.on_call_redirected)(call->index, + target, e); + } else { + PJ_LOG(4,(THIS_FILE, "Unhandled redirection for call %d " + "(callback not implemented by application). Disconnecting " + "call.", + call->index)); + op = PJSIP_REDIRECT_STOP; + } + + PJSUA_UNLOCK(); + + return op; +} + diff --git a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_core.c b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_core.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_core.c rename to libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_core.c index c631d48ccdbc5e6e36558736a86a709823108544..f6e51a07cbeb1763f630a676941adaef00e07b79 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_core.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_core.c @@ -1,5 +1,6 @@ -/* $Id: pjsua_core.c 2315 2008-09-24 10:10:15Z bennylp $ */ +/* $Id: pjsua_core.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -827,13 +828,6 @@ on_error: /* Sleep with polling */ static void busy_sleep(unsigned msec) { -#if defined(PJ_SYMBIAN) && PJ_SYMBIAN != 0 - /* Ideally we shouldn't call pj_thread_sleep() and rather - * CActiveScheduler::WaitForAnyRequest() here, but that will - * drag in Symbian header and it doesn't look pretty. - */ - pj_thread_sleep(msec); -#else pj_time_val timeout, now; pj_gettimeofday(&timeout); @@ -845,7 +839,6 @@ static void busy_sleep(unsigned msec) ; pj_gettimeofday(&now); } while (PJ_TIME_VAL_LT(now, timeout)); -#endif } @@ -1203,12 +1196,9 @@ PJ_DEF(pj_status_t) pjsua_start(void) PJ_DEF(int) pjsua_handle_events(unsigned msec_timeout) { #if defined(PJ_SYMBIAN) && PJ_SYMBIAN != 0 - /* Ideally we shouldn't call pj_thread_sleep() and rather - * CActiveScheduler::WaitForAnyRequest() here, but that will - * drag in Symbian header and it doesn't look pretty. - */ - pj_thread_sleep(msec_timeout); - return msec_timeout; + + return pj_symbianos_poll(-1, msec_timeout); + #else unsigned count = 0; @@ -1225,6 +1215,7 @@ PJ_DEF(int) pjsua_handle_events(unsigned msec_timeout) return -status; return count; + #endif } diff --git a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_im.c b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_im.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_im.c rename to libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_im.c index d06149b1cc320cc5d96a71c55a558f11f02161f2..803cac1580dced52ccca1fdfe84e79cb23d74645 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_im.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_im.c @@ -1,5 +1,6 @@ -/* $Id: pjsua_im.c 2118 2008-07-10 20:45:03Z bennylp $ */ +/* $Id: pjsua_im.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_media.c b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_media.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_media.c rename to libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_media.c index 7b19cf2ec3a0893540b213d53d09718fde33af55..009b41fdcfa66d0c684b84a9025f7cbba0206f17 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_media.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_media.c @@ -1,5 +1,6 @@ -/* $Id: pjsua_media.c 2343 2008-10-07 12:42:24Z nanang $ */ +/* $Id: pjsua_media.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_pres.c b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_pres.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_pres.c rename to libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_pres.c index 7484899826edd1c8b7aa3b41fb78ad96b46bc753..616f2e62793923b598bd85f60d16e34640b48613 100644 --- a/libs/pjproject-1.0/pjsip/src/pjsua-lib/pjsua_pres.c +++ b/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_pres.c @@ -1,5 +1,6 @@ -/* $Id: pjsua_pres.c 2273 2008-09-11 10:25:51Z bennylp $ */ +/* $Id: pjsua_pres.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify @@ -137,7 +138,7 @@ PJ_DEF(pj_status_t) pjsua_enum_buddies( pjsua_buddy_id ids[], PJ_DEF(pj_status_t) pjsua_buddy_get_info( pjsua_buddy_id buddy_id, pjsua_buddy_info *info) { - int total=0; + unsigned total=0; pjsua_buddy *buddy; PJ_ASSERT_RETURN(buddy_id>=0 && @@ -776,7 +777,7 @@ static pj_bool_t pres_on_rx_request(pjsip_rx_data *rdata) else uapres->expires = -1; - st_code = 200; + st_code = (pjsip_status_code)200; reason = pj_str("OK"); pjsua_msg_data_init(&msg_data); diff --git a/libs/pjproject-1.0/pjsip/src/test-pjsip/dlg_core_test.c b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/dlg_core_test.c similarity index 86% rename from libs/pjproject-1.0/pjsip/src/test-pjsip/dlg_core_test.c rename to libs/pjproject-1.0.1/pjsip/src/test-pjsip/dlg_core_test.c index f3434b5b8575bd75756abbd492cec606d7d4a883..5c4ea99540d7813825f915557aa37c42f45c8fb3 100644 --- a/libs/pjproject-1.0/pjsip/src/test-pjsip/dlg_core_test.c +++ b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/dlg_core_test.c @@ -1,5 +1,6 @@ -/* $Id: dlg_core_test.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: dlg_core_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/test-pjsip/dns_test.c b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/dns_test.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/test-pjsip/dns_test.c rename to libs/pjproject-1.0.1/pjsip/src/test-pjsip/dns_test.c index 63caa192b4aeccb392d89115f78f5e020db1555f..341902fe3f39900715e05ab2e3e5dc1caef98de0 100644 --- a/libs/pjproject-1.0/pjsip/src/test-pjsip/dns_test.c +++ b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/dns_test.c @@ -1,5 +1,6 @@ -/* $Id: dns_test.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: dns_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/test-pjsip/inv_offer_answer_test.c b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/inv_offer_answer_test.c similarity index 99% rename from libs/pjproject-1.0/pjsip/src/test-pjsip/inv_offer_answer_test.c rename to libs/pjproject-1.0.1/pjsip/src/test-pjsip/inv_offer_answer_test.c index d79baa5d7a370517d0facfcbc6d2025a0b24188c..26f091d96729651269cdd46f0d4a1853d9cb4be5 100644 --- a/libs/pjproject-1.0/pjsip/src/test-pjsip/inv_offer_answer_test.c +++ b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/inv_offer_answer_test.c @@ -1,5 +1,6 @@ -/* $Id: inv_offer_answer_test.c 2285 2008-09-16 16:45:29Z nanang $ */ +/* $Id: inv_offer_answer_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/test-pjsip/main.c b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/main.c similarity index 94% rename from libs/pjproject-1.0/pjsip/src/test-pjsip/main.c rename to libs/pjproject-1.0.1/pjsip/src/test-pjsip/main.c index a9b845f62a2235fb52e2029aff20898869057d51..531559dcec81e0f01955f46a445bc4e35bd56c02 100644 --- a/libs/pjproject-1.0/pjsip/src/test-pjsip/main.c +++ b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/main.c @@ -1,5 +1,6 @@ -/* $Id: main.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/test-pjsip/main_rtems.c b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/main_rtems.c similarity index 100% rename from libs/pjproject-1.0/pjsip/src/test-pjsip/main_rtems.c rename to libs/pjproject-1.0.1/pjsip/src/test-pjsip/main_rtems.c diff --git a/libs/pjproject-1.0/pjsip/src/test-pjsip/main_win32.c b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/main_win32.c similarity index 100% rename from libs/pjproject-1.0/pjsip/src/test-pjsip/main_win32.c rename to libs/pjproject-1.0.1/pjsip/src/test-pjsip/main_win32.c diff --git a/libs/pjproject-1.0/pjsip/src/test-pjsip/msg_err_test.c b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/msg_err_test.c similarity index 94% rename from libs/pjproject-1.0/pjsip/src/test-pjsip/msg_err_test.c rename to libs/pjproject-1.0.1/pjsip/src/test-pjsip/msg_err_test.c index 5d9465ec919ca80f983e8442adaaf1a1ae412a98..e261fc3d2e8885bab80b287dabc83c997e7047d7 100644 --- a/libs/pjproject-1.0/pjsip/src/test-pjsip/msg_err_test.c +++ b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/msg_err_test.c @@ -1,5 +1,6 @@ -/* $Id: msg_err_test.c 2039 2008-06-20 22:44:47Z bennylp $ */ +/* $Id: msg_err_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ /* + * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono * * This program is free software; you can redistribute it and/or modify diff --git a/libs/pjproject-1.0/pjsip/src/test-pjsip/msg_logger.c b/libs/pjproject-1.0.1/pjsip/src/test-pjsip/msg_logger.c similarity index 95% rename fro