diff --git a/sflphone-client-gnome/src/actions.c b/sflphone-client-gnome/src/actions.c index 95eb391fc097dbc730875cb9e7bfa46176882994..4e632c9ca245a117de4dc626474625a8e87f4d77 100644 --- a/sflphone-client-gnome/src/actions.c +++ b/sflphone-client-gnome/src/actions.c @@ -862,38 +862,42 @@ sflphone_fill_codec_list() gchar** details; gchar** pl; - for(pl=order; *order; order++) + if (codecs) { - codec_t * c = g_new0(codec_t, 1); - c->_payload = atoi(*order); - details = (gchar **)dbus_codec_details(c->_payload); - //DEBUG("Codec details: %s / %s / %s / %s",details[0],details[1],details[2],details[3]); + for(pl=order; *order; order++) + { + codec_t * c = g_new0(codec_t, 1); + c->_payload = atoi(*order); + details = (gchar **)dbus_codec_details(c->_payload); - c->name = details[0]; - c->is_active = TRUE; - c->sample_rate = atoi(details[1]); - c->_bitrate = atof(details[2]); - c->_bandwidth = atof(details[3]); - codec_list_add(c); - } + //DEBUG("Codec details: %s / %s / %s / %s",details[0],details[1],details[2],details[3]); - for(pl=codecs; *codecs; codecs++) - { - details = (gchar **)dbus_codec_details(atoi(*codecs)); - if(codec_list_get_by_payload(atoi(*codecs))!=NULL){ - // does nothing - the codec is already in the list, so is active. - } - else{ - codec_t* c = g_new0(codec_t, 1); - c->_payload = atoi(*codecs); c->name = details[0]; - c->is_active = FALSE; + c->is_active = TRUE; c->sample_rate = atoi(details[1]); c->_bitrate = atof(details[2]); c->_bandwidth = atof(details[3]); codec_list_add(c); } + + for(pl=codecs; *codecs; codecs++) + { + details = (gchar **)dbus_codec_details(atoi(*codecs)); + if(codec_list_get_by_payload(atoi(*codecs))!=NULL){ + // does nothing - the codec is already in the list, so is active. + } + else{ + codec_t* c = g_new0(codec_t, 1); + c->_payload = atoi(*codecs); + c->name = details[0]; + c->is_active = FALSE; + c->sample_rate = atoi(details[1]); + c->_bitrate = atof(details[2]); + c->_bandwidth = atof(details[3]); + codec_list_add(c); + } + } } if( codec_list_get_size() == 0) { diff --git a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml index 05e6d554c3aef376d5592d3c3eb99ed37b253d41..7e3888c2338960ea9c20d4d0d7e0fed94c09a4cf 100644 --- a/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml +++ b/sflphone-client-gnome/src/dbus/configurationmanager-introspec.xml @@ -310,7 +310,7 @@ </method> <method name="getHistory"> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> <arg type="a{ss}" name="entries" direction="out"/> </method> diff --git a/sflphone-client-kde/po/README b/sflphone-client-kde/po/README index 2fbea68fa4f7d87d731b243af1aa6efbac6fe7cf..ab2bcad9f3573ccd744aa27f191b2d5eedafdcb8 100644 --- a/sflphone-client-kde/po/README +++ b/sflphone-client-kde/po/README @@ -1,7 +1,14 @@ - -If we need to update translations files, do the following steps: +If you need to update translations files, just execute: - xgettext --c++ --kde -ktr2i18n -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../build/src/*.h ../build/src/*.cpp + ./update.sh + +in the current directory. + + + +If you want to do it yourself, do the following steps: + + xgettext --c++ --kde -ktr2i18n -kki18nc:2c,1 -kki18n -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../build/src/*.h ../build/src/*.cpp This command will update the template file with the current source files. To be able to add strings from the ui files, and other non-c++ files which generates some c++ source, you have to first build and make the project in build directory (see the INSTALL file in root directory sflphone-client-kde). diff --git a/sflphone-client-kde/po/de/sflphone-client-kde.po b/sflphone-client-kde/po/de/sflphone-client-kde.po index c5a5d7703a2546e0c4228566c87a672e3ce890d8..ccbeede61592a5763e3af4c480a68b36ed2542a1 100644 --- a/sflphone-client-kde/po/de/sflphone-client-kde.po +++ b/sflphone-client-kde/po/de/sflphone-client-kde.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:40-0400\n" +"POT-Creation-Date: 2009-06-17 15:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -151,50 +151,60 @@ msgstr "" msgid "Transfer to : " msgstr "" -#: ../src/ConfigDialog.cpp:131 +#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263 msgid "Attention : SIP port must be over 1024 !" msgstr "" -#: ../src/ConfigDialog.cpp:136 +#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266 msgid "Attention : SIP port must be under 65536 !" msgstr "" -#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055 -#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065 +#: ../src/main.cpp:49 ../src/main.cpp:50 +msgctxt "Your names" +msgid "NAME OF TRANSLATORS" +msgstr "" + +#: ../src/main.cpp:50 ../src/main.cpp:51 +msgctxt "Your emails" +msgid "EMAIL OF TRANSLATORS" +msgstr "" + +#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051 +#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061 msgid "SFLPhone" msgstr "" -#: ../src/SFLPhone.cpp:152 +#: ../src/SFLPhone.cpp:154 msgid "You still have some calls open. Please close all calls before quitting." msgstr "" -#: ../src/SFLPhone.cpp:180 +#: ../src/SFLPhone.cpp:182 msgid "Incoming call" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "You have an incoming call from" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "Click to accept or refuse it." msgstr "" -#: ../src/sflphone_kdeview.cpp:1055 +#: ../src/sflphone_kdeview.cpp:1051 msgid "Main screen" msgstr "" -#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271 +#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271 #: ../build/src/ui_dlggeneralbase.h:160 msgid "Call history" msgstr "" -#: ../src/sflphone_kdeview.cpp:1065 +#: ../src/sflphone_kdeview.cpp:1061 #: ../build/src/ui_sflphone_kdeview_base.h:507 msgid "Address book" msgstr "" -#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135 +#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131 msgid "Edit before call" msgstr "" diff --git a/sflphone-client-kde/po/es/sflphone-client-kde.po b/sflphone-client-kde/po/es/sflphone-client-kde.po index ba7f9509aa129a84a36f19832397b6d43efa250d..d8af45b68bdc669a021952c89c623dfdfc4621c0 100644 --- a/sflphone-client-kde/po/es/sflphone-client-kde.po +++ b/sflphone-client-kde/po/es/sflphone-client-kde.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:40-0400\n" +"POT-Creation-Date: 2009-06-17 15:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -151,50 +151,60 @@ msgstr "" msgid "Transfer to : " msgstr "" -#: ../src/ConfigDialog.cpp:131 +#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263 msgid "Attention : SIP port must be over 1024 !" msgstr "" -#: ../src/ConfigDialog.cpp:136 +#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266 msgid "Attention : SIP port must be under 65536 !" msgstr "" -#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055 -#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065 +#: ../src/main.cpp:49 ../src/main.cpp:50 +msgctxt "Your names" +msgid "NAME OF TRANSLATORS" +msgstr "" + +#: ../src/main.cpp:50 ../src/main.cpp:51 +msgctxt "Your emails" +msgid "EMAIL OF TRANSLATORS" +msgstr "" + +#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051 +#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061 msgid "SFLPhone" msgstr "" -#: ../src/SFLPhone.cpp:152 +#: ../src/SFLPhone.cpp:154 msgid "You still have some calls open. Please close all calls before quitting." msgstr "" -#: ../src/SFLPhone.cpp:180 +#: ../src/SFLPhone.cpp:182 msgid "Incoming call" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "You have an incoming call from" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "Click to accept or refuse it." msgstr "" -#: ../src/sflphone_kdeview.cpp:1055 +#: ../src/sflphone_kdeview.cpp:1051 msgid "Main screen" msgstr "" -#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271 +#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271 #: ../build/src/ui_dlggeneralbase.h:160 msgid "Call history" msgstr "" -#: ../src/sflphone_kdeview.cpp:1065 +#: ../src/sflphone_kdeview.cpp:1061 #: ../build/src/ui_sflphone_kdeview_base.h:507 msgid "Address book" msgstr "" -#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135 +#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131 msgid "Edit before call" msgstr "" diff --git a/sflphone-client-kde/po/fr/sflphone-client-kde.po b/sflphone-client-kde/po/fr/sflphone-client-kde.po index 4086fe3d2273e7b2fa181ca82726cddf2d443736..fd63212aef25485185116a924b09f45c5cee4c8d 100644 --- a/sflphone-client-kde/po/fr/sflphone-client-kde.po +++ b/sflphone-client-kde/po/fr/sflphone-client-kde.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:40-0400\n" +"POT-Creation-Date: 2009-06-17 15:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -166,52 +166,62 @@ msgstr "" msgid "Transfer to : " msgstr " Transférer à : " -#: ../src/ConfigDialog.cpp:131 +#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263 msgid "Attention : SIP port must be over 1024 !" msgstr "Attention : le port SIP doit être supérieur à 1024 !" -#: ../src/ConfigDialog.cpp:136 +#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266 msgid "Attention : SIP port must be under 65536 !" msgstr "Attention : le port SIP doit être inférieur à 65536 !" -#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055 -#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065 +#: ../src/main.cpp:49 ../src/main.cpp:50 +msgctxt "Your names" +msgid "NAME OF TRANSLATORS" +msgstr "" + +#: ../src/main.cpp:50 ../src/main.cpp:51 +msgctxt "Your emails" +msgid "EMAIL OF TRANSLATORS" +msgstr "" + +#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051 +#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061 msgid "SFLPhone" msgstr "SFLPhone" -#: ../src/SFLPhone.cpp:152 +#: ../src/SFLPhone.cpp:154 msgid "You still have some calls open. Please close all calls before quitting." msgstr "" "Il reste des appels ouverts. Veuillez les raccrocher avant de quitter " "l'application." -#: ../src/SFLPhone.cpp:180 +#: ../src/SFLPhone.cpp:182 msgid "Incoming call" msgstr "Appel entrant" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "You have an incoming call from" msgstr "Vous avez un appel entrant de" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "Click to accept or refuse it." msgstr "Cliquez sur ce message pour accepter ou refuser" -#: ../src/sflphone_kdeview.cpp:1055 +#: ../src/sflphone_kdeview.cpp:1051 msgid "Main screen" msgstr "Écran principal" -#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271 +#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271 #: ../build/src/ui_dlggeneralbase.h:160 msgid "Call history" msgstr "Historique d'appel" -#: ../src/sflphone_kdeview.cpp:1065 +#: ../src/sflphone_kdeview.cpp:1061 #: ../build/src/ui_sflphone_kdeview_base.h:507 msgid "Address book" msgstr "Carnet d'adresse" -#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135 +#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131 msgid "Edit before call" msgstr "Éditer avant d'appeler" diff --git a/sflphone-client-kde/po/ru/sflphone-client-kde.po b/sflphone-client-kde/po/ru/sflphone-client-kde.po index 63b2cc6c192a3eccd42fa8cb696241e22ec15e79..d8af45b68bdc669a021952c89c623dfdfc4621c0 100644 --- a/sflphone-client-kde/po/ru/sflphone-client-kde.po +++ b/sflphone-client-kde/po/ru/sflphone-client-kde.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 19:00-0400\n" +"POT-Creation-Date: 2009-06-17 15:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -151,50 +151,60 @@ msgstr "" msgid "Transfer to : " msgstr "" -#: ../src/ConfigDialog.cpp:131 +#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263 msgid "Attention : SIP port must be over 1024 !" msgstr "" -#: ../src/ConfigDialog.cpp:136 +#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266 msgid "Attention : SIP port must be under 65536 !" msgstr "" -#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055 -#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065 +#: ../src/main.cpp:49 ../src/main.cpp:50 +msgctxt "Your names" +msgid "NAME OF TRANSLATORS" +msgstr "" + +#: ../src/main.cpp:50 ../src/main.cpp:51 +msgctxt "Your emails" +msgid "EMAIL OF TRANSLATORS" +msgstr "" + +#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051 +#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061 msgid "SFLPhone" msgstr "" -#: ../src/SFLPhone.cpp:152 +#: ../src/SFLPhone.cpp:154 msgid "You still have some calls open. Please close all calls before quitting." msgstr "" -#: ../src/SFLPhone.cpp:180 +#: ../src/SFLPhone.cpp:182 msgid "Incoming call" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "You have an incoming call from" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "Click to accept or refuse it." msgstr "" -#: ../src/sflphone_kdeview.cpp:1055 +#: ../src/sflphone_kdeview.cpp:1051 msgid "Main screen" msgstr "" -#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271 +#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271 #: ../build/src/ui_dlggeneralbase.h:160 msgid "Call history" msgstr "" -#: ../src/sflphone_kdeview.cpp:1065 +#: ../src/sflphone_kdeview.cpp:1061 #: ../build/src/ui_sflphone_kdeview_base.h:507 msgid "Address book" msgstr "" -#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135 +#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131 msgid "Edit before call" msgstr "" diff --git a/sflphone-client-kde/po/sflphone-client-kde.pot b/sflphone-client-kde/po/sflphone-client-kde.pot index e8ab6fe12be027d7964b7e053f2d893ef6068602..3bf4ef029eed187fca57085a05532be356a43121 100644 --- a/sflphone-client-kde/po/sflphone-client-kde.pot +++ b/sflphone-client-kde/po/sflphone-client-kde.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 19:00-0400\n" +"POT-Creation-Date: 2009-06-17 15:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -151,50 +151,60 @@ msgstr "" msgid "Transfer to : " msgstr "" -#: ../src/ConfigDialog.cpp:131 +#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263 msgid "Attention : SIP port must be over 1024 !" msgstr "" -#: ../src/ConfigDialog.cpp:136 +#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266 msgid "Attention : SIP port must be under 65536 !" msgstr "" -#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055 -#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065 +#: ../src/main.cpp:49 ../src/main.cpp:50 +msgctxt "Your names" +msgid "NAME OF TRANSLATORS" +msgstr "" + +#: ../src/main.cpp:50 ../src/main.cpp:51 +msgctxt "Your emails" +msgid "EMAIL OF TRANSLATORS" +msgstr "" + +#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051 +#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061 msgid "SFLPhone" msgstr "" -#: ../src/SFLPhone.cpp:152 +#: ../src/SFLPhone.cpp:154 msgid "You still have some calls open. Please close all calls before quitting." msgstr "" -#: ../src/SFLPhone.cpp:180 +#: ../src/SFLPhone.cpp:182 msgid "Incoming call" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "You have an incoming call from" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "Click to accept or refuse it." msgstr "" -#: ../src/sflphone_kdeview.cpp:1055 +#: ../src/sflphone_kdeview.cpp:1051 msgid "Main screen" msgstr "" -#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271 +#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271 #: ../build/src/ui_dlggeneralbase.h:160 msgid "Call history" msgstr "" -#: ../src/sflphone_kdeview.cpp:1065 +#: ../src/sflphone_kdeview.cpp:1061 #: ../build/src/ui_sflphone_kdeview_base.h:507 msgid "Address book" msgstr "" -#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135 +#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131 msgid "Edit before call" msgstr "" diff --git a/sflphone-client-kde/po/update.sh b/sflphone-client-kde/po/update.sh index ccf5a3589ee5a93d8a1b29af389be5effb850f8b..4c0188296d9194b1343e761e27b9e63f5cdb9ead 100755 --- a/sflphone-client-kde/po/update.sh +++ b/sflphone-client-kde/po/update.sh @@ -1,4 +1,4 @@ -xgettext --c++ --kde -ktr2i18n -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../build/src/*.h ../build/src/*.cpp +xgettext --c++ --kde -ktr2i18n -kki18nc:2c,1 -kki18n -o sflphone-client-kde.pot ../src/*.cpp ../src/*.h ../build/src/*.h ../build/src/*.cpp for fichier in `find . -name *.po ` do diff --git a/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po b/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po index ba7f9509aa129a84a36f19832397b6d43efa250d..d8af45b68bdc669a021952c89c623dfdfc4621c0 100644 --- a/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po +++ b/sflphone-client-kde/po/zh_CN/sflphone-client-kde.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:40-0400\n" +"POT-Creation-Date: 2009-06-17 15:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -151,50 +151,60 @@ msgstr "" msgid "Transfer to : " msgstr "" -#: ../src/ConfigDialog.cpp:131 +#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263 msgid "Attention : SIP port must be over 1024 !" msgstr "" -#: ../src/ConfigDialog.cpp:136 +#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266 msgid "Attention : SIP port must be under 65536 !" msgstr "" -#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055 -#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065 +#: ../src/main.cpp:49 ../src/main.cpp:50 +msgctxt "Your names" +msgid "NAME OF TRANSLATORS" +msgstr "" + +#: ../src/main.cpp:50 ../src/main.cpp:51 +msgctxt "Your emails" +msgid "EMAIL OF TRANSLATORS" +msgstr "" + +#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051 +#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061 msgid "SFLPhone" msgstr "" -#: ../src/SFLPhone.cpp:152 +#: ../src/SFLPhone.cpp:154 msgid "You still have some calls open. Please close all calls before quitting." msgstr "" -#: ../src/SFLPhone.cpp:180 +#: ../src/SFLPhone.cpp:182 msgid "Incoming call" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "You have an incoming call from" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "Click to accept or refuse it." msgstr "" -#: ../src/sflphone_kdeview.cpp:1055 +#: ../src/sflphone_kdeview.cpp:1051 msgid "Main screen" msgstr "" -#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271 +#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271 #: ../build/src/ui_dlggeneralbase.h:160 msgid "Call history" msgstr "" -#: ../src/sflphone_kdeview.cpp:1065 +#: ../src/sflphone_kdeview.cpp:1061 #: ../build/src/ui_sflphone_kdeview_base.h:507 msgid "Address book" msgstr "" -#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135 +#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131 msgid "Edit before call" msgstr "" diff --git a/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po b/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po index ba7f9509aa129a84a36f19832397b6d43efa250d..d8af45b68bdc669a021952c89c623dfdfc4621c0 100644 --- a/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po +++ b/sflphone-client-kde/po/zh_HK/sflphone-client-kde.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-06-09 18:40-0400\n" +"POT-Creation-Date: 2009-06-17 15:48-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -151,50 +151,60 @@ msgstr "" msgid "Transfer to : " msgstr "" -#: ../src/ConfigDialog.cpp:131 +#: ../src/ConfigDialog.cpp:131 ../src/ConfigDialog.cpp:263 msgid "Attention : SIP port must be over 1024 !" msgstr "" -#: ../src/ConfigDialog.cpp:136 +#: ../src/ConfigDialog.cpp:136 ../src/ConfigDialog.cpp:266 msgid "Attention : SIP port must be under 65536 !" msgstr "" -#: ../src/SFLPhone.cpp:54 ../src/sflphone_kdeview.cpp:1055 -#: ../src/sflphone_kdeview.cpp:1060 ../src/sflphone_kdeview.cpp:1065 +#: ../src/main.cpp:49 ../src/main.cpp:50 +msgctxt "Your names" +msgid "NAME OF TRANSLATORS" +msgstr "" + +#: ../src/main.cpp:50 ../src/main.cpp:51 +msgctxt "Your emails" +msgid "EMAIL OF TRANSLATORS" +msgstr "" + +#: ../src/SFLPhone.cpp:55 ../src/sflphone_kdeview.cpp:1051 +#: ../src/sflphone_kdeview.cpp:1056 ../src/sflphone_kdeview.cpp:1061 msgid "SFLPhone" msgstr "" -#: ../src/SFLPhone.cpp:152 +#: ../src/SFLPhone.cpp:154 msgid "You still have some calls open. Please close all calls before quitting." msgstr "" -#: ../src/SFLPhone.cpp:180 +#: ../src/SFLPhone.cpp:182 msgid "Incoming call" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "You have an incoming call from" msgstr "" -#: ../src/SFLPhone.cpp:181 +#: ../src/SFLPhone.cpp:183 msgid "Click to accept or refuse it." msgstr "" -#: ../src/sflphone_kdeview.cpp:1055 +#: ../src/sflphone_kdeview.cpp:1051 msgid "Main screen" msgstr "" -#: ../src/sflphone_kdeview.cpp:1060 ../build/src/ui_ConfigDialog.h:1271 +#: ../src/sflphone_kdeview.cpp:1056 ../build/src/ui_ConfigDialog.h:1271 #: ../build/src/ui_dlggeneralbase.h:160 msgid "Call history" msgstr "" -#: ../src/sflphone_kdeview.cpp:1065 +#: ../src/sflphone_kdeview.cpp:1061 #: ../build/src/ui_sflphone_kdeview_base.h:507 msgid "Address book" msgstr "" -#: ../src/sflphone_kdeview.cpp:1079 ../src/sflphone_kdeview.cpp:1135 +#: ../src/sflphone_kdeview.cpp:1075 ../src/sflphone_kdeview.cpp:1131 msgid "Edit before call" msgstr "" diff --git a/sflphone-client-kde/src/Call.cpp b/sflphone-client-kde/src/Call.cpp index 6dcbc48280673542daf7ea38aa7c5a04d4203e92..68b99d7fc0bbec73a0615e560159c37a58fd5d72 100644 --- a/sflphone-client-kde/src/Call.cpp +++ b/sflphone-client-kde/src/Call.cpp @@ -563,12 +563,13 @@ void Call::appendItemText(QString text) break; case CALL_STATE_CURRENT: //TODO replace account string by an Account instance and handle damn pointers to avoid detruction of Accounts - //if(peer == account->getAccountDetail(ACCOUNT_MAILBOX)) - if(peerPhoneNumber == configurationManager.getAccountDetails(account).value()[ACCOUNT_MAILBOX]) - { - text = QString(QChar(0x9A)); - } +// if(peerPhoneNumber == configurationManager.getAccountDetails(account).value()[ACCOUNT_MAILBOX]) +// { +// text = QString(QChar(0x9A)); +// } + text = QString(); editNumber = labelCallNumber; + break; default: qDebug() << "Type key on call not editable. Doing nothing."; diff --git a/sflphone-client-kde/src/ConfigDialog.cpp b/sflphone-client-kde/src/ConfigDialog.cpp index 308576a75a62ffaa6b5451ac54407e7567f75bbf..ea604136da422e38bf82efd9424d3dc0689dd885 100644 --- a/sflphone-client-kde/src/ConfigDialog.cpp +++ b/sflphone-client-kde/src/ConfigDialog.cpp @@ -122,7 +122,7 @@ void ConfigurationDialog::loadOptions() //////////////////////// //Call history settings - spinBox_historyCapacity->setValue(configurationManager.getMaxCalls()); + spinBox_historyCapacity->setValue(configurationManager.getHistoryLimit()); //SIP port settings int sipPort = configurationManager.getSipPort(); @@ -254,16 +254,16 @@ void ConfigurationDialog::saveOptions() //////////////////////// //Call history settings - configurationManager.setMaxCalls(spinBox_historyCapacity->value()); + configurationManager.setHistoryLimit(spinBox_historyCapacity->value()); //SIP port settings int sipPort = spinBox_SIPPort->value(); if(sipPort<1025){ - errorWindow->showMessage("Attention : le port SIP doit être supérieur à 1024 !"); + errorWindow->showMessage(tr2i18n("Attention : SIP port must be over 1024 !")); } if(sipPort>65535){ - errorWindow->showMessage("Attention : le port SIP doit être inférieur à 65536 !"); + errorWindow->showMessage(tr2i18n("Attention : SIP port must be under 65536 !")); } configurationManager.setSipPort(sipPort); diff --git a/sflphone-client-kde/src/SFLPhone.cpp b/sflphone-client-kde/src/SFLPhone.cpp index acc374710648690ea86e7cf2ff3952d41ff3f749..e30be21a897cb3d565873fad4d80b9fd450c87a6 100644 --- a/sflphone-client-kde/src/SFLPhone.cpp +++ b/sflphone-client-kde/src/SFLPhone.cpp @@ -27,6 +27,7 @@ #include <KMenu> #include <KAction> #include <KToolBar> +#include <KStatusBar> #include <QtGui/QStatusBar> #include <KActionCollection> @@ -71,6 +72,7 @@ SFLPhone::SFLPhone(QWidget *parent) createGUI(rcFilePath); QMetaObject::connectSlotsByName(this); + } @@ -223,4 +225,9 @@ void SFLPhone::on_trayIcon_activated(QSystemTrayIcon::ActivationReason reason) } +void SFLPhone::on_view_statusMessageChanged(QString message) +{ + qDebug() << "on_view_statusMessageChanged"; + statusBar()->showMessage(message); +} diff --git a/sflphone-client-kde/src/SFLPhone.h b/sflphone-client-kde/src/SFLPhone.h index 94213bdeeabac1434b9b7b4f3a945dcda5ab9f67..8ab101402fbadb8da1217b798f96bd9663088731 100644 --- a/sflphone-client-kde/src/SFLPhone.h +++ b/sflphone-client-kde/src/SFLPhone.h @@ -70,6 +70,7 @@ public: private slots: void on_trayIcon_activated(QSystemTrayIcon::ActivationReason reason); void on_trayIcon_messageClicked(); + void on_view_statusMessageChanged(QString message); void quitButton(); diff --git a/sflphone-client-kde/src/dbus/callmanager-introspec.xml b/sflphone-client-kde/src/dbus/callmanager-introspec.xml index dbc84d3542c77ceba6beb6f07f3904aa2e4d8ce8..e9130e9a91a8d7bf17f3dc43180f33d1e11438e4 100644 --- a/sflphone-client-kde/src/dbus/callmanager-introspec.xml +++ b/sflphone-client-kde/src/dbus/callmanager-introspec.xml @@ -1,120 +1,129 @@ <?xml version="1.0" ?> <node name="/org/sflphone/SFLphone"> - <interface name="org.sflphone.SFLphone.CallManager"> - - <method name="placeCall"> - <arg type="s" name="accountID" direction="in"/> - <arg type="s" name="callID" direction="in"/> - <arg type="s" name="to" direction="in"/> - </method> - - <method name="refuse"> - <arg type="s" name="callID" direction="in"/> - </method> - - <method name="accept"> - <arg type="s" name="callID" direction="in"/> - </method> - - <method name="hangUp"> - <arg type="s" name="callID" direction="in"/> - </method> - - <method name="hold"> - <arg type="s" name="callID" direction="in"/> - </method> - - <method name="unhold"> - <arg type="s" name="callID" direction="in"/> - </method> - - <method name="transfert"> - <arg type="s" name="callID" direction="in"/> - <arg type="s" name="to" direction="in"/> - </method> - - <method name="playDTMF"> - <arg type="s" name="key" direction="in"/> - </method> - - <method name="startTone"> - <arg type="i" name="start" direction="in"/> - <arg type="i" name="type" direction="in"/> - </method> - - <method name="setVolume"> - <arg type="s" name="device" direction="in"/> - <arg type="d" name="value" direction="in"/> - </method> - - <method name="getVolume"> - <arg type="s" name="device" direction="in"/> - <arg type="d" name="value" direction="out"/> - </method> - - <method name="setRecording"> - <arg type="s" name="callID" direction="in"/> - </method> - - <method name="getIsRecording"> - <arg type="s" name="callID" direction="in"/> - <arg type="b" name="isRecording" direction="out"/> - </method> - - <method name="getCallDetails"> - <arg type="s" name="callID" direction="in"/> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> - <arg type="a{ss}" name="infos" direction="out"/> - </method> - - <method name="getCurrentCallID"> - <arg type="s" name="callID" direction="out"/> - </method> - - <method name="getCurrentCodecName"> - <arg type="s" name="callID" direction="in"/> - <arg type="s" name="codecName" direction="out"/> - </method> - - <signal name="currentSelectedCodec"> - <arg type="s" name="callID" direction="out" /> - <arg type="s" name="codecName" direction="out"/> - </signal> - - <signal name="incomingCall"> - <arg type="s" name="accountID" /> - <arg type="s" name="callID" /> - <arg type="s" name="from" /> - </signal> - - <signal name="incomingMessage"> - <arg type="s" name="accountID" direction="out" /> - <arg type="s" name="message" direction="out"/> - </signal> - - <signal name="callStateChanged"> - <arg type="s" name="callID" direction="out"/> - <arg type="s" name="state" direction="out"/> - </signal> - - <signal name="voiceMailNotify"> - <arg type="s" name="accountID" direction="out"/> - <arg type="i" name="count" direction="out"/> - </signal> - - - <signal name="volumeChanged"> - <arg type="s" name="device" direction="out"/> - <arg type="d" name="value" direction="out"/> - </signal> - -<!-- - <signal name="error"> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> - <arg type="a{ss}" name="details" direction="out"/> - </signal> ---> - - </interface> -</node> + <interface name="org.sflphone.SFLphone.CallManager"> + + <method name="placeCall"> + <arg type="s" name="accountID" direction="in"/> + <arg type="s" name="callID" direction="in"/> + <arg type="s" name="to" direction="in"/> + </method> + + <method name="refuse"> + <arg type="s" name="callID" direction="in"/> + </method> + + <method name="accept"> + <arg type="s" name="callID" direction="in"/> + </method> + + <method name="hangUp"> + <arg type="s" name="callID" direction="in"/> + </method> + + <method name="hold"> + <arg type="s" name="callID" direction="in"/> + </method> + + <method name="unhold"> + <arg type="s" name="callID" direction="in"/> + </method> + + <method name="transfert"> + <arg type="s" name="callID" direction="in"/> + <arg type="s" name="to" direction="in"/> + </method> + + <method name="playDTMF"> + <arg type="s" name="key" direction="in"/> + </method> + + <method name="startTone"> + <arg type="i" name="start" direction="in"/> + <arg type="i" name="type" direction="in"/> + </method> + + <method name="setVolume"> + <arg type="s" name="device" direction="in"/> + <arg type="d" name="value" direction="in"/> + </method> + + <method name="getVolume"> + <arg type="s" name="device" direction="in"/> + <arg type="d" name="value" direction="out"/> + </method> + + <method name="setRecording"> + <arg type="s" name="callID" direction="in"/> + </method> + + <method name="getIsRecording"> + <arg type="s" name="callID" direction="in"/> + <arg type="b" name="isRecording" direction="out"/> + </method> + + <method name="getCallDetails"> + <arg type="s" name="callID" direction="in"/> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> + <arg type="a{ss}" name="infos" direction="out"/> + </method> + + <method name="getCallList"> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="getCurrentCallID"> + <arg type="s" name="callID" direction="out"/> + </method> + + <method name="getCurrentCodecName"> + <arg type="s" name="callID" direction="in"/> + <arg type="s" name="codecName" direction="out"/> + </method> + + <signal name="currentSelectedCodec"> + <arg type="s" name="callID" direction="out" /> + <arg type="s" name="codecName" direction="out"/> + </signal> + + <signal name="incomingCall"> + <arg type="s" name="accountID" /> + <arg type="s" name="callID" /> + <arg type="s" name="from" /> + </signal> + + <signal name="incomingMessage"> + <arg type="s" name="accountID" direction="out" /> + <arg type="s" name="message" direction="out"/> + </signal> + + <signal name="callStateChanged"> + <arg type="s" name="callID" direction="out"/> + <arg type="s" name="state" direction="out"/> + </signal> + + <signal name="voiceMailNotify"> + <arg type="s" name="accountID" direction="out"/> + <arg type="i" name="count" direction="out"/> + </signal> + + <signal name="volumeChanged"> + <arg type="s" name="device" direction="out"/> + <arg type="d" name="value" direction="out"/> + </signal> + + <signal name="transferSucceded"> + </signal> + + <signal name="transferFailed"> + </signal> + + <!-- + <signal name="error"> + <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> + <arg type="a{ss}" name="details" direction="out"/> + </signal> + --> + + </interface> + </node> diff --git a/sflphone-client-kde/src/dbus/configurationmanager-introspec.xml b/sflphone-client-kde/src/dbus/configurationmanager-introspec.xml index 9a4375bb0cfce1a67ff8790ae119202015d0ce16..cb587f3e3f60c8455834926f2909ecf800b9158b 100644 --- a/sflphone-client-kde/src/dbus/configurationmanager-introspec.xml +++ b/sflphone-client-kde/src/dbus/configurationmanager-introspec.xml @@ -1,323 +1,340 @@ <?xml version="1.0" ?> <node name="/org/sflphone/SFLphone"> - <interface name="org.sflphone.SFLphone.ConfigurationManager"> - - <!-- Accounts-related methods --> - <method name="getAccountDetails"> - <arg type="s" name="accountID" direction="in"/> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> - <arg type="a{ss}" name="details" direction="out"/> - </method> - - <method name="setAccountDetails"> - <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/> - <arg type="s" name="accountID" direction="in"/> - <arg type="a{ss}" name="details" direction="in"/> - </method> - - <method name="addAccount"> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/> - <arg type="a{ss}" name="details" direction="in"/> - <arg type="s" name="createdAccountId" direction="out"/> - </method> - - <method name="setAccountsOrder"> - <arg type="s" name="order" direction="in"/> - </method> - - <method name="removeAccount"> - <arg type="s" name="accoundID" direction="in"/> - </method> - - <method name="getAccountList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="sendRegister"> - <arg type="s" name="accountID" direction="in"/> - <arg type="i" name="expire" direction="in"/> - </method> - - <!-- /////////////////////// --> - - <!-- Various audio-related methods --> - - <method name="getToneLocaleList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="getVersion"> - <arg type="s" name="version" direction="out"/> - </method> - - <method name="getRingtoneList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="getPlaybackDeviceList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="getRecordDeviceList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="isRingtoneEnabled"> - <arg type="i" name="bool" direction="out"/> - </method> - - <method name="ringtoneEnabled"> - </method> - - <method name="getRingtoneChoice"> - <arg type="s" name="tone" direction="out"/> - </method> - - <method name="setRingtoneChoice"> - <arg type="s" name="tone" direction="in"/> - </method> - - <method name="getAudioManager"> - <arg type="i" name="api" direction="out"/> - </method> - - <method name="setAudioManager"> - <arg type="i" name="api" direction="in"/> - </method> - - <method name="getRecordPath"> - <arg type="s" name="rec" direction="out"/> - </method> - - <method name="setRecordPath"> - <arg type="s" name="rec" direction="in"/> - </method> - - <!-- /////////////////////// --> - - <!-- Codecs-related methods --> - - <method name="getCodecList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="getCodecDetails"> - <arg type="i" name="payload" direction="in"/> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="details" direction="out"/> - </method> - - <method name="getActiveCodecList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="setActiveCodecList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorString"/> - <arg type="as" name="list" direction="in"/> - </method> - - - <!-- Audio devices methods --> - - <method name="getInputAudioPluginList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="getOutputAudioPluginList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="setInputAudioPlugin"> - <arg type="s" name="audioPlugin" direction="in"/> - </method> - - <method name="setOutputAudioPlugin"> - <arg type="s" name="audioPlugin" direction="in"/> - </method> - - <method name="getAudioOutputDeviceList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="setAudioOutputDevice"> - <arg type="i" name="index" direction="in"/> - </method> - - <method name="getAudioInputDeviceList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="setAudioInputDevice"> - <arg type="i" name="index" direction="in"/> - </method> - - <method name="getCurrentAudioDevicesIndex"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="list" direction="out"/> - </method> - - <method name="getAudioDeviceIndex"> - <arg type="s" name="name" direction="in"/> - <arg type="i" name="index" direction="out"/> - </method> - - <method name="getCurrentAudioOutputPlugin"> - <arg type="s" name="plugin" direction="out"/> - </method> - - <!-- General Settings Panel --> - - <method name="isIax2Enabled"> - <arg type="i" name="res" direction="out"/> - </method> - - <method name="setNotify"> - </method> - - <method name="getNotify"> - <arg type="i" name="level" direction="out"/> - </method> - - <method name="setMailNotify"> - </method> - - <method name="getMailNotify"> - <arg type="i" name="level" direction="out"/> - </method> - - <method name="getDialpad"> - <arg type="i" name="state" direction="out"/> - </method> - - <method name="setDialpad"> - </method> - - <method name="getSearchbar"> - <arg type="i" name="state" direction="out"/> - </method> - - <method name="setSearchbar"> - </method> - - <method name="getVolumeControls"> - <arg type="i" name="state" direction="out"/> - </method> - - <method name="setVolumeControls"> - </method> - - <method name="getMaxCalls"> - <arg type="i" name="calls" direction="out"/> - </method> - - <method name="setMaxCalls"> - <arg type="i" name="calls" direction="in"/> - </method> - - <method name="startHidden"> - </method> - - <method name="isStartHidden"> - <arg type="i" name="state" direction="out"/> - </method> - - <method name="popupMode"> - <arg type="i" name="state" direction="out"/> - </method> - - <method name="switchPopupMode"> - </method> - - <method name="setPulseAppVolumeControl"> - </method> - - <method name="getPulseAppVolumeControl"> - <arg type="i" name="state" direction="out"/> - </method> - - <method name="setSipPort"> - <arg type="i" name="port" direction="in"/> - </method> - - <method name="getSipPort"> - <arg type="i" name="port" direction="out"/> - </method> - - <method name="setStunServer"> - <arg type="s" name="server" direction="in"/> - </method> - - <method name="getStunServer"> - <arg type="s" name="server" direction="out"/> - </method> - - <method name="enableStun"> - </method> - - <method name="isStunEnabled"> - <arg type="i" name="state" direction="out"/> - </method> - - <!-- Addressbook configuration --> - <method name="getAddressbookSettings"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringInt"/> - <arg type="a{si}" name="settings" direction="out"/> - </method> - - <method name="setAddressbookSettings"> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringInt"/> - <arg type="a{si}" name="settings" direction="in"/> - </method> - - <!-- Addressbook list --> - <method name="getAddressbookList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> - <arg type="as" name="settings" direction="out"/> - </method> - - <method name="setAddressbookList"> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorString"/> - <arg type="as" name="settings" direction="in"/> - </method> - - <!-- Hook configuration --> - <method name="getHookSettings"> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> - <arg type="a{ss}" name="settings" direction="out"/> - </method> - - <method name="setHookSettings"> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/> - <arg type="a{ss}" name="settings" direction="in"/> - </method> - - <!-- ///////////////////////////// --> - -<!-- - <signal name="parametersChanged"> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/> - <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> - <arg type="a{ss}" name="details" direction="out"/> - </signal> ---> - - <signal name="accountsChanged"> - </signal> - - <signal name="errorAlert"> - <arg type="i" name="code" direction="out"/> - </signal> - - </interface> -</node> + <interface name="org.sflphone.SFLphone.ConfigurationManager"> + + <!-- Accounts-related methods --> + <method name="getAccountDetails"> + <arg type="s" name="accountID" direction="in"/> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> + <arg type="a{ss}" name="details" direction="out"/> + </method> + + <method name="setAccountDetails"> + <annotation name="com.trolltech.QtDBus.QtTypeName.In1" value="MapStringString"/> + <arg type="s" name="accountID" direction="in"/> + <arg type="a{ss}" name="details" direction="in"/> + </method> + + <method name="addAccount"> + <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/> + <arg type="a{ss}" name="details" direction="in"/> + <arg type="s" name="createdAccountId" direction="out"/> + </method> + + <method name="setAccountsOrder"> + <arg type="s" name="order" direction="in"/> + </method> + + <method name="removeAccount"> + <arg type="s" name="accoundID" direction="in"/> + </method> + + <method name="getAccountList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="sendRegister"> + <arg type="s" name="accountID" direction="in"/> + <arg type="i" name="expire" direction="in"/> + </method> + + <!-- /////////////////////// --> + + <!-- Various audio-related methods --> + + <method name="getToneLocaleList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="getVersion"> + <arg type="s" name="version" direction="out"/> + </method> + + <method name="getRingtoneList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="getPlaybackDeviceList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="getRecordDeviceList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="isRingtoneEnabled"> + <arg type="i" name="bool" direction="out"/> + </method> + + <method name="ringtoneEnabled"> + </method> + + <method name="getRingtoneChoice"> + <arg type="s" name="tone" direction="out"/> + </method> + + <method name="setRingtoneChoice"> + <arg type="s" name="tone" direction="in"/> + </method> + + <method name="getAudioManager"> + <arg type="i" name="api" direction="out"/> + </method> + + <method name="setAudioManager"> + <arg type="i" name="api" direction="in"/> + </method> + + <method name="getRecordPath"> + <arg type="s" name="rec" direction="out"/> + </method> + + <method name="setRecordPath"> + <arg type="s" name="rec" direction="in"/> + </method> + + <!-- /////////////////////// --> + + <!-- Codecs-related methods --> + + <method name="getCodecList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="getCodecDetails"> + <arg type="i" name="payload" direction="in"/> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="details" direction="out"/> + </method> + + <method name="getActiveCodecList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="setActiveCodecList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorString"/> + <arg type="as" name="list" direction="in"/> + </method> + + + <!-- Audio devices methods --> + + <method name="getInputAudioPluginList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="getOutputAudioPluginList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="setInputAudioPlugin"> + <arg type="s" name="audioPlugin" direction="in"/> + </method> + + <method name="setOutputAudioPlugin"> + <arg type="s" name="audioPlugin" direction="in"/> + </method> + + <method name="getAudioOutputDeviceList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="setAudioOutputDevice"> + <arg type="i" name="index" direction="in"/> + </method> + + <method name="getAudioInputDeviceList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="setAudioInputDevice"> + <arg type="i" name="index" direction="in"/> + </method> + + <method name="getCurrentAudioDevicesIndex"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="list" direction="out"/> + </method> + + <method name="getAudioDeviceIndex"> + <arg type="s" name="name" direction="in"/> + <arg type="i" name="index" direction="out"/> + </method> + + <method name="getCurrentAudioOutputPlugin"> + <arg type="s" name="plugin" direction="out"/> + </method> + + <!-- General Settings Panel --> + + <method name="isIax2Enabled"> + <arg type="i" name="res" direction="out"/> + </method> + + <method name="setNotify"> + </method> + + <method name="getNotify"> + <arg type="i" name="level" direction="out"/> + </method> + + <method name="setMailNotify"> + </method> + + <method name="getMailNotify"> + <arg type="i" name="level" direction="out"/> + </method> + + <method name="getDialpad"> + <arg type="i" name="state" direction="out"/> + </method> + + <method name="setDialpad"> + </method> + + <method name="getSearchbar"> + <arg type="i" name="state" direction="out"/> + </method> + + <method name="setSearchbar"> + </method> + + <method name="setHistoryEnabled"> + </method> + + <method name="getHistoryEnabled"> + <arg type="i" name="state" direction="out"/> + </method> + + <method name="getVolumeControls"> + <arg type="i" name="state" direction="out"/> + </method> + + <method name="setVolumeControls"> + </method> + + <method name="getHistoryLimit"> + <arg type="i" name="days" direction="out"/> + </method> + + <method name="setHistoryLimit"> + <arg type="i" name="days" direction="in"/> + </method> + + <method name="startHidden"> + </method> + + <method name="isStartHidden"> + <arg type="i" name="state" direction="out"/> + </method> + + <method name="popupMode"> + <arg type="i" name="state" direction="out"/> + </method> + + <method name="switchPopupMode"> + </method> + + <method name="setPulseAppVolumeControl"> + </method> + + <method name="getPulseAppVolumeControl"> + <arg type="i" name="state" direction="out"/> + </method> + + <method name="setSipPort"> + <arg type="i" name="port" direction="in"/> + </method> + + <method name="getSipPort"> + <arg type="i" name="port" direction="out"/> + </method> + + <method name="setStunServer"> + <arg type="s" name="server" direction="in"/> + </method> + + <method name="getStunServer"> + <arg type="s" name="server" direction="out"/> + </method> + + <method name="enableStun"> + </method> + + <method name="isStunEnabled"> + <arg type="i" name="state" direction="out"/> + </method> + + <!-- Addressbook configuration --> + <method name="getAddressbookSettings"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringInt"/> + <arg type="a{si}" name="settings" direction="out"/> + </method> + + <method name="setAddressbookSettings"> + <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringInt"/> + <arg type="a{si}" name="settings" direction="in"/> + </method> + + <!-- Addressbook list --> + <method name="getAddressbookList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="VectorString"/> + <arg type="as" name="settings" direction="out"/> + </method> + + <method name="setAddressbookList"> + <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="VectorString"/> + <arg type="as" name="settings" direction="in"/> + </method> + + <!-- Hook configuration --> + <method name="getHookSettings"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> + <arg type="a{ss}" name="settings" direction="out"/> + </method> + + <method name="setHookSettings"> + <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/> + <arg type="a{ss}" name="settings" direction="in"/> + </method> + + <method name="getHistory"> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> + <arg type="a{ss}" name="entries" direction="out"/> + </method> + + <method name="setHistory"> + <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/> + <arg type="a{ss}" name="entries" direction="in"/> + </method> + + <!-- ///////////////////////////// --> + + <!-- + <signal name="parametersChanged"> + <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> + <arg type="a{ss}" name="details" direction="out"/> + </signal> + --> + + <signal name="accountsChanged"> + </signal> + + <signal name="errorAlert"> + <arg type="i" name="code" direction="out"/> + </signal> + + </interface> + </node> diff --git a/sflphone-client-kde/src/dbus/instance-introspec.xml b/sflphone-client-kde/src/dbus/instance-introspec.xml index 90a60d632d04ca83039efcadcfa2f4981bfda39e..d211a0f483588ba8f9dcb620b6f6804963d6d41e 100644 --- a/sflphone-client-kde/src/dbus/instance-introspec.xml +++ b/sflphone-client-kde/src/dbus/instance-introspec.xml @@ -1,18 +1,18 @@ <?xml version="1.0" ?> <node name="/org/sflphone/SFLphone"> - <interface name="org.sflphone.SFLphone.Instance"> - - <method name="Register"> - <arg type="i" name="pid" direction="in"/> - <arg type="s" name="name" direction="in"/> - </method> - - <method name="Unregister"> - <arg type="i" name="pid" direction="in"/> - </method> - - <method name="getRegistrationCount"> - <arg type="i" name="count" direction="out"/> - </method> - </interface> + <interface name="org.sflphone.SFLphone.Instance"> + + <method name="Register"> + <arg type="i" name="pid" direction="in"/> + <arg type="s" name="name" direction="in"/> + </method> + + <method name="Unregister"> + <arg type="i" name="pid" direction="in"/> + </method> + + <method name="getRegistrationCount"> + <arg type="i" name="count" direction="out"/> + </method> + </interface> </node> diff --git a/sflphone-client-kde/src/main.cpp b/sflphone-client-kde/src/main.cpp index 76865ea15927284ce4d684a69cb088c1863bd9e1..e0cb4b3b1450f6a71ffcace74cf754d6822afc37 100644 --- a/sflphone-client-kde/src/main.cpp +++ b/sflphone-client-kde/src/main.cpp @@ -19,7 +19,7 @@ #include "conf/ConfigurationDialog.h" -static const char description[] = I18N_NOOP("A KDE 4 Client for SFLPhone"); +static const char description[] = I18N_NOOP("A KDE 4 Client for SFLphone"); static const char version[] = "0.9.5"; @@ -35,16 +35,19 @@ int main(int argc, char **argv) KAboutData about( "sflphone-client-kde", 0, - ki18n("SFLPhone KDE Client"), + ki18n("SFLphone KDE Client"), version, ki18n(description), - KAboutData::License_GPL, + KAboutData::License_GPL_V3, ki18n("(C) 2009 Savoir-faire Linux"), KLocalizedString(), - 0, - "jeremy.quentin@savoirfairelinux.com"); + "http://www.sflphone.org.", + "sflphone@lists.savoirfairelinux.net"); about.addAuthor( ki18n("Jérémy Quentin"), KLocalizedString(), "jeremy.quentin@savoirfairelinux.com" ); + about.setProgramIconName(ICON_SFLPHONE); + about.setTranslator( ki18nc("NAME OF TRANSLATORS","Your names"), ki18nc("EMAIL OF TRANSLATORS","Your emails") ); + KCmdLineArgs::init(argc, argv, &about); KCmdLineOptions options; //options.add("+[URL]", ki18n( "Document to open" )); diff --git a/sflphone-client-kde/src/qrc/resources.qrc b/sflphone-client-kde/src/qrc/resources.qrc index db22439d98b1410434876265ccd04a0a4f6ff8d0..f0410dc28014b0658f684e46dd28af1adac1f05a 100644 --- a/sflphone-client-kde/src/qrc/resources.qrc +++ b/sflphone-client-kde/src/qrc/resources.qrc @@ -1,6 +1,7 @@ <RCC> <qresource prefix="images" > <file>../icons/sflphone.svg</file> + <file>../icons/sflphone-kde3.svg</file> <file>../icons/sflphone_notif.svg</file> <file>../icons/x-office-address-book.png</file> <file>../icons/add.png</file> diff --git a/sflphone-client-kde/src/sflphone_const.h b/sflphone-client-kde/src/sflphone_const.h index 9583eb776ba43e429125a82e15f6be25c7f234c5..9771be44158dd78337f519f97679c81184c1e9c5 100644 --- a/sflphone-client-kde/src/sflphone_const.h +++ b/sflphone-client-kde/src/sflphone_const.h @@ -160,6 +160,7 @@ #define CALL_STATE_CHANGE_FAILURE "FAILURE" #define CALL_STATE_CHANGE_UNHOLD_CURRENT "UNHOLD_CURRENT" #define CALL_STATE_CHANGE_UNHOLD_RECORD "UNHOLD_RECORD" +#define CALL_STATE_CHANGE_UNKNOWN "UNKNOWN" /** Address Book Settings */ #define ADDRESSBOOK_MAX_RESULTS "ADDRESSBOOK_MAX_RESULTS" diff --git a/sflphone-client-kde/src/sflphone_kdeview.cpp b/sflphone-client-kde/src/sflphone_kdeview.cpp index 221756b90598860f4c866282205b0e5cba7088fb..132d8378e56bed352ca7f44a6f5fae5879e02417 100644 --- a/sflphone-client-kde/src/sflphone_kdeview.cpp +++ b/sflphone-client-kde/src/sflphone_kdeview.cpp @@ -85,6 +85,8 @@ sflphone_kdeView::sflphone_kdeView(QWidget *parent) loadWindow(); + emit statusMessageChanged("youhou"); + } sflphone_kdeView::~sflphone_kdeView() @@ -494,6 +496,7 @@ void sflphone_kdeView::updateWindowCallState() enabledActions[3] = false; break; case CALL_STATE_CURRENT: + qDebug() << "Calling getCallDetails3"; qDebug() << "details = " << CallManagerInterfaceSingleton::getInstance().getCallDetails(call->getCallId()).value(); qDebug() << "Reached CALL_STATE_CURRENT with call " << (*callList)[item]->getCallId() << ". Updating window."; recordEnabled = true; @@ -1399,7 +1402,7 @@ void sflphone_kdeView::on1_incomingCall(const QString &accountID, const QString void sflphone_kdeView::on1_incomingMessage(const QString &accountID, const QString &message) { - qDebug() << "Signal : Incoming Message ! "; + qDebug() << "Signal : Incoming Message ! \nMessage : " << message; } void sflphone_kdeView::on1_voiceMailNotify(const QString &accountID, int count) diff --git a/sflphone-client-kde/src/sflphone_kdeview.h b/sflphone-client-kde/src/sflphone_kdeview.h index eb3f9651acd89bd83bbb4e67d8c32b3739cfd02d..9f2a182eaa7ae68833b1d520575713a7bb55f0a6 100644 --- a/sflphone-client-kde/src/sflphone_kdeview.h +++ b/sflphone-client-kde/src/sflphone_kdeview.h @@ -200,6 +200,8 @@ private slots: void on1_voiceMailNotify(const QString &accountID, int count); void on1_volumeChanged(const QString &device, double value); +signals: + void statusMessageChanged(QString message); }; diff --git a/sflphone-common/configure.ac b/sflphone-common/configure.ac index 0c85fb56c761f50de6308a261cbfb850ca903a29..8b6344b26fb3b59f72bd10389bfa0b3bc4504ce6 100644 --- a/sflphone-common/configure.ac +++ b/sflphone-common/configure.ac @@ -407,6 +407,6 @@ AC_DEFINE_UNQUOTED(DBUS_SERVICES_DIR, "$DBUS_SERVICES_DIR", [Where services dir AC_SUBST(SFLPHONE_CFLAGS) AC_SUBST(SFLPHONE_LIBS) AC_OUTPUT -AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-1.0.1) has already been compiled. Run `make' to build the software.]]) +AC_MSG_NOTICE([[Configuration done! Please make sure that pjsip library (libs/pjproject-1.0.2) has already been compiled. Run `make' to build the software.]]) diff --git a/sflphone-common/globals.mak b/sflphone-common/globals.mak index fa19f77b645232c5d1ed7745f8d7e9ea946c1c7d..3bd883bd3091b4daedc226cb89ca9d1282ccba65 100644 --- a/sflphone-common/globals.mak +++ b/sflphone-common/globals.mak @@ -3,13 +3,15 @@ src=$(top_srcdir) sflcodecdir=$(DESTDIR)$(libdir)/sflphone/codecs sflplugindir=$(DESTDIR)$(libdir)/sflphone/plugins +PJSIP_VERSION="1.0.2" + # for pjsip PJSIP_LIBS= \ - -L$(src)/libs/pjproject-1.0.1/pjnath/lib/ \ - -L$(src)/libs/pjproject-1.0.1/pjsip/lib/ \ - -L$(src)/libs/pjproject-1.0.1/pjlib/lib/ \ - -L$(src)/libs/pjproject-1.0.1/pjlib-util/lib/ \ - -L$(src)/libs/pjproject-1.0.1/pjmedia/lib/ \ + -L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjnath/lib/ \ + -L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjsip/lib/ \ + -L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib/lib/ \ + -L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib-util/lib/ \ + -L$(src)/libs/pjproject-$(PJSIP_VERSION)/pjmedia/lib/ \ -lpjnath-sfl-$(target) \ -lpjsua-sfl-$(target) \ -lpjsip-sfl-$(target) \ @@ -20,11 +22,11 @@ PJSIP_LIBS= \ -lpjlib-util-sfl-$(target) \ -lpj-sfl-$(target) -SIP_CFLAGS=-I$(src)/libs/pjproject-1.0.1/pjsip/include \ - -I$(src)/libs/pjproject-1.0.1/pjlib/include \ - -I$(src)/libs/pjproject-1.0.1/pjlib-util/include \ - -I$(src)/libs/pjproject-1.0.1/pjmedia/include \ - -I$(src)/libs/pjproject-1.0.1/pjnath/include +SIP_CFLAGS=-I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjsip/include \ + -I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib/include \ + -I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjlib-util/include \ + -I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjmedia/include \ + -I$(src)/libs/pjproject-$(PJSIP_VERSION)/pjnath/include DBUSCPP_CFLAGS=$(top_srcdir)/libs/dbus-c++/include/dbus-c++ @@ -45,7 +47,7 @@ AM_CPPFLAGS = \ -I$(src)/libs \ -I$(src)/libs/dbus-c++/include \ -I$(src)/libs/iax2 \ - -I$(src)/libs/pjproject-1.0.1 \ + -I$(src)/libs/pjproject-$(PJSIP_VERSION) \ -I$(src)/src \ -I$(src)/src/config \ -I$(src)/test \ diff --git a/sflphone-common/libs/dbus-c++/tools/Makefile.am b/sflphone-common/libs/dbus-c++/tools/Makefile.am index e4403ea27509cd29b82154041aa155267533b379..a207aa1bd0c08381019bebf773ac6a21ea942a9b 100644 --- a/sflphone-common/libs/dbus-c++/tools/Makefile.am +++ b/sflphone-common/libs/dbus-c++/tools/Makefile.am @@ -14,7 +14,7 @@ AM_CPPFLAGS = \ libdbus_cxx_la = $(top_builddir)/libs/dbus-c++/src/libdbus-c++-1.la #endif -bin_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect +noinst_PROGRAMS = dbusxx-xml2cpp dbusxx-introspect dbusxx_xml2cpp_SOURCES = xml.h xml.cpp xml2cpp.h xml2cpp.cpp \ generate_adaptor.cpp generate_adaptor.h generate_proxy.cpp\ diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/tools/cmp_wav.exe b/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/tools/cmp_wav.exe deleted file mode 100644 index 6220771b2824920d1f5f1a6a85be31a44d975a8b..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/tools/cmp_wav.exe and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.11.wav b/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.11.wav deleted file mode 100644 index 712aea72b6e2b2acb9f755f594f2d8f7ff733a69..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.11.wav and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.16.wav b/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.16.wav deleted file mode 100644 index da25cfcd85ea465b2e52f7ef8f2a7baa445a89c8..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.16.wav and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.2.16.wav b/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.2.16.wav deleted file mode 100644 index a885fe98ef3e44a3b0e13511c4eb514795fea0cb..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.2.16.wav and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.2.8.wav b/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.2.8.wav deleted file mode 100644 index 95b2310d7d5ca75a0fe1fcb5911793c8d9233d96..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.2.8.wav and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.22.wav b/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.22.wav deleted file mode 100644 index bc309dd88e0147bea54618825d8acd41fd5f5142..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.22.wav and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.32.wav b/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.32.wav deleted file mode 100644 index 4fc356ad074d85b566144abd08fd04489380e083..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.32.wav and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.44.wav b/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.44.wav deleted file mode 100644 index 6262d9145ad2e984c2311c8c8d11a9f71be52daf..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.44.wav and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.48.wav b/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.48.wav deleted file mode 100644 index 5f32bb326768d9ef15ca0e78e8b8ae94cdce5516..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.48.wav and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.8.wav b/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.8.wav deleted file mode 100644 index 4fa44d46e284e11c95ec37d6ad29dd07e87e9f74..0000000000000000000000000000000000000000 Binary files a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/wavs/input.8.wav and /dev/null differ diff --git a/sflphone-common/libs/pjproject-1.0.1/COPYING b/sflphone-common/libs/pjproject-1.0.2/COPYING similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/COPYING rename to sflphone-common/libs/pjproject-1.0.2/COPYING diff --git a/sflphone-common/libs/pjproject-1.0.1/INSTALL.txt b/sflphone-common/libs/pjproject-1.0.2/INSTALL.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/INSTALL.txt rename to sflphone-common/libs/pjproject-1.0.2/INSTALL.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/Makefile b/sflphone-common/libs/pjproject-1.0.2/Makefile similarity index 77% rename from sflphone-common/libs/pjproject-1.0.1/Makefile rename to sflphone-common/libs/pjproject-1.0.2/Makefile index 469f20c49d060d40d46e4bd6df81084d99432aed..c6e7b62c4f9ade6e95c19c589853890b61a24e4b 100644 --- a/sflphone-common/libs/pjproject-1.0.1/Makefile +++ b/sflphone-common/libs/pjproject-1.0.2/Makefile @@ -29,16 +29,16 @@ doc: fi; \ done -LIBS = pjlib/lib/libpj-sfl-$(TARGET_NAME).a \ - pjlib-util/lib/libpjlib-util-sfl-$(TARGET_NAME).a \ - pjnath/lib/libpjnath-sfl-$(TARGET_NAME).a \ - pjmedia/lib/libpjmedia-sfl-$(TARGET_NAME).a \ - pjmedia/lib/libpjmedia-codec-sfl-$(TARGET_NAME).a \ - pjsip/lib/libpjsip-sfl-$(TARGET_NAME).a \ - pjsip/lib/libpjsip-ua-sfl-$(TARGET_NAME).a \ - pjsip/lib/libpjsip-simple-sfl-$(TARGET_NAME).a \ - pjsip/lib/libpjsua-sfl-$(TARGET_NAME).a -BINS = pjsip-apps/bin/pjsua-sfl-$(TARGET_NAME)$(HOST_EXE) +LIBS = pjlib/lib/libpj-sfl-$(TARGET_NAME).a \ + pjlib-util/lib/libpjlib-util-sfl-$(TARGET_NAME).a \ + pjnath/lib/libpjnath-sfl-$(TARGET_NAME).a \ + pjmedia/lib/libpjmedia-sfl-$(TARGET_NAME).a \ + pjmedia/lib/libpjmedia-codec-sfl-$(TARGET_NAME).a \ + pjsip/lib/libpjsip-sfl-$(TARGET_NAME).a \ + pjsip/lib/libpjsip-ua-sfl-$(TARGET_NAME).a \ + pjsip/lib/libpjsip-simple-sfl-$(TARGET_NAME).a \ + pjsip/lib/libpjsua-sfl-$(TARGET_NAME).a +BINS = pjsip-apps/bin/pjsua-sfl-$(TARGET_NAME)$(HOST_EXE) size: @echo -n 'Date: ' diff --git a/sflphone-common/libs/pjproject-1.0.1/README-RTEMS b/sflphone-common/libs/pjproject-1.0.2/README-RTEMS similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/README-RTEMS rename to sflphone-common/libs/pjproject-1.0.2/README-RTEMS diff --git a/sflphone-common/libs/pjproject-1.0.1/README.txt b/sflphone-common/libs/pjproject-1.0.2/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/README.txt rename to sflphone-common/libs/pjproject-1.0.2/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/aconfigure b/sflphone-common/libs/pjproject-1.0.2/aconfigure similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/aconfigure rename to sflphone-common/libs/pjproject-1.0.2/aconfigure diff --git a/sflphone-common/libs/pjproject-1.0.1/aconfigure.ac b/sflphone-common/libs/pjproject-1.0.2/aconfigure.ac similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/aconfigure.ac rename to sflphone-common/libs/pjproject-1.0.2/aconfigure.ac diff --git a/sflphone-common/libs/pjproject-1.0.1/autogen.sh b/sflphone-common/libs/pjproject-1.0.2/autogen.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/autogen.sh rename to sflphone-common/libs/pjproject-1.0.2/autogen.sh diff --git a/sflphone-common/libs/pjproject-1.0.2/build.mak b/sflphone-common/libs/pjproject-1.0.2/build.mak new file mode 100644 index 0000000000000000000000000000000000000000..beaaa3918eb3482ea0a2e949c39325843871a872 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/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 := x86_64-unknown-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/emilou/git-repos/sflphone/sflphone-common/libs/pjproject-1.0.2 +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 -luuid -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/sflphone-common/libs/pjproject-1.0.1/build.mak.in b/sflphone-common/libs/pjproject-1.0.2/build.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.mak.in rename to sflphone-common/libs/pjproject-1.0.2/build.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/00.bat b/sflphone-common/libs/pjproject-1.0.2/build.symbian/00.bat similarity index 81% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/00.bat rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/00.bat index 6a9a63522c3c0397b97113a10cdfaab332a75208..4d41259dfa4e3023026f4b99d85cce0010ebb2a4 100644 --- a/sflphone-common/libs/pjproject-1.0.1/build.symbian/00.bat +++ b/sflphone-common/libs/pjproject-1.0.2/build.symbian/00.bat @@ -3,4 +3,5 @@ @rem set EPOCROOT=\Symbian\9.1\S60_3rd_MR_2\ @rem set EPOCROOT=\Symbian\UIQ3SDK\ @rem set EPOCROOT=\symbian\UIQ3.1\ +@rem set EPOCROOT=\symbian\9.2\S60_3rd_FP1\ bldmake bldfiles diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/01.bat b/sflphone-common/libs/pjproject-1.0.2/build.symbian/01.bat similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/01.bat rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/01.bat diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/bld.inf b/sflphone-common/libs/pjproject-1.0.2/build.symbian/bld.inf similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/bld.inf rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/bld.inf diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/libgsmcodec.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/libgsmcodec.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/libgsmcodec.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/libgsmcodec.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/libspeexcodec.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/libspeexcodec.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/libspeexcodec.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/libspeexcodec.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/libsrtp.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/libsrtp.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/libsrtp.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/libsrtp.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/makedef.sh b/sflphone-common/libs/pjproject-1.0.2/build.symbian/makedef.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/makedef.sh rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/makedef.sh diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/null_audio.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audio.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/null_audio.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audio.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/null_audioU.def b/sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audioU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/null_audioU.def rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/null_audioU.def diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjlib.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjlib.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjlibU.def b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlibU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjlibU.def rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlibU.def diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjlib_test.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_test.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjlib_test.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_test.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjlib_util.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_util.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjlib_util.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_util.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjlib_utilU.def b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_utilU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjlib_utilU.def rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjlib_utilU.def diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjmedia.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmedia.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjmedia.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmedia.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjmediaU.def b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmediaU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjmediaU.def rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjmediaU.def diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjnath.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnath.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjnath.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnath.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjnathU.def b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnathU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjnathU.def rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjnathU.def diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjproject.cww b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjproject.cww similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjproject.cww rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjproject.cww diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsdp.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdp.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsdp.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdp.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsdpU.def b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdpU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsdpU.def rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsdpU.def diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsip.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsip.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsipU.def b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsipU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsipU.def rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsipU.def diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsip_simple.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simple.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsip_simple.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simple.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsip_simpleU.def b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simpleU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsip_simpleU.def rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_simpleU.def diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsip_ua.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_ua.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsip_ua.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_ua.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsip_uaU.def b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_uaU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsip_uaU.def rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsip_uaU.def diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjstun_client.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjstun_client.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjstun_client.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjstun_client.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsua_lib.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_lib.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsua_lib.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_lib.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsua_libU.def b/sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_libU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/pjsua_libU.def rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/pjsua_libU.def diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_audio.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_audio.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_audioU.def b/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audioU.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_audioU.def rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audioU.def diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_audio_aps.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio_aps.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_audio_aps.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_audio_aps.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_ua.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_ua.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_ua_udeb.pkg b/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_udeb.pkg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_ua_udeb.pkg rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_udeb.pkg diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_ua_urel.pkg b/sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_urel.pkg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/symbian_ua_urel.pkg rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/symbian_ua_urel.pkg diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/symsndtest.mmp b/sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/symsndtest.mmp rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/build.symbian/symsndtest.pkg b/sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.pkg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build.symbian/symsndtest.pkg rename to sflphone-common/libs/pjproject-1.0.2/build.symbian/symsndtest.pkg diff --git a/sflphone-common/libs/pjproject-1.0.1/build/cc-gcc.mak b/sflphone-common/libs/pjproject-1.0.2/build/cc-gcc.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/cc-gcc.mak rename to sflphone-common/libs/pjproject-1.0.2/build/cc-gcc.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/cc-vc.mak b/sflphone-common/libs/pjproject-1.0.2/build/cc-vc.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/cc-vc.mak rename to sflphone-common/libs/pjproject-1.0.2/build/cc-vc.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/common.mak b/sflphone-common/libs/pjproject-1.0.2/build/common.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/common.mak rename to sflphone-common/libs/pjproject-1.0.2/build/common.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/host-mingw.mak b/sflphone-common/libs/pjproject-1.0.2/build/host-mingw.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/host-mingw.mak rename to sflphone-common/libs/pjproject-1.0.2/build/host-mingw.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/host-unix.mak b/sflphone-common/libs/pjproject-1.0.2/build/host-unix.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/host-unix.mak rename to sflphone-common/libs/pjproject-1.0.2/build/host-unix.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/host-win32.mak b/sflphone-common/libs/pjproject-1.0.2/build/host-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/host-win32.mak rename to sflphone-common/libs/pjproject-1.0.2/build/host-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/m-alpha.mak b/sflphone-common/libs/pjproject-1.0.2/build/m-alpha.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/m-alpha.mak rename to sflphone-common/libs/pjproject-1.0.2/build/m-alpha.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/m-arm.mak b/sflphone-common/libs/pjproject-1.0.2/build/m-arm.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/m-arm.mak rename to sflphone-common/libs/pjproject-1.0.2/build/m-arm.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/m-auto.mak b/sflphone-common/libs/pjproject-1.0.2/build/m-auto.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/m-auto.mak rename to sflphone-common/libs/pjproject-1.0.2/build/m-auto.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/m-i386.mak b/sflphone-common/libs/pjproject-1.0.2/build/m-i386.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/m-i386.mak rename to sflphone-common/libs/pjproject-1.0.2/build/m-i386.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/m-m68k.mak b/sflphone-common/libs/pjproject-1.0.2/build/m-m68k.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/m-m68k.mak rename to sflphone-common/libs/pjproject-1.0.2/build/m-m68k.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/m-mpc860.mak b/sflphone-common/libs/pjproject-1.0.2/build/m-mpc860.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/m-mpc860.mak rename to sflphone-common/libs/pjproject-1.0.2/build/m-mpc860.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/m-powerpc.mak b/sflphone-common/libs/pjproject-1.0.2/build/m-powerpc.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/m-powerpc.mak rename to sflphone-common/libs/pjproject-1.0.2/build/m-powerpc.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/m-sparc.mak b/sflphone-common/libs/pjproject-1.0.2/build/m-sparc.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/m-sparc.mak rename to sflphone-common/libs/pjproject-1.0.2/build/m-sparc.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/m-x86_64.mak b/sflphone-common/libs/pjproject-1.0.2/build/m-x86_64.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/m-x86_64.mak rename to sflphone-common/libs/pjproject-1.0.2/build/m-x86_64.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak new file mode 100644 index 0000000000000000000000000000000000000000..f88de8f7e39bf8bb66fbe8975178b957c9e01ed1 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/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 -luuid -lnsl -lrt -lpthread -lasound + +export OS_SOURCES := + + diff --git a/sflphone-common/libs/pjproject-1.0.1/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.2/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.1/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.2/build/os-darwinos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/os-darwinos.mak rename to sflphone-common/libs/pjproject-1.0.2/build/os-darwinos.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/os-linux-kernel.mak b/sflphone-common/libs/pjproject-1.0.2/build/os-linux-kernel.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/os-linux-kernel.mak rename to sflphone-common/libs/pjproject-1.0.2/build/os-linux-kernel.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.2/build/os-linux.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/os-linux.mak rename to sflphone-common/libs/pjproject-1.0.2/build/os-linux.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/os-palmos.mak b/sflphone-common/libs/pjproject-1.0.2/build/os-palmos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/os-palmos.mak rename to sflphone-common/libs/pjproject-1.0.2/build/os-palmos.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.2/build/os-rtems.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/os-rtems.mak rename to sflphone-common/libs/pjproject-1.0.2/build/os-rtems.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/os-sunos.mak b/sflphone-common/libs/pjproject-1.0.2/build/os-sunos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/os-sunos.mak rename to sflphone-common/libs/pjproject-1.0.2/build/os-sunos.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.2/build/os-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/os-win32.mak rename to sflphone-common/libs/pjproject-1.0.2/build/os-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/build/rules.mak b/sflphone-common/libs/pjproject-1.0.2/build/rules.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/build/rules.mak rename to sflphone-common/libs/pjproject-1.0.2/build/rules.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/c++-build.mak b/sflphone-common/libs/pjproject-1.0.2/c++-build.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/c++-build.mak rename to sflphone-common/libs/pjproject-1.0.2/c++-build.mak diff --git a/sflphone-common/libs/pjproject-1.0.2/config.guess b/sflphone-common/libs/pjproject-1.0.2/config.guess new file mode 120000 index 0000000000000000000000000000000000000000..f42b0a5a40bce9574720756960dac396d7d88e01 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/config.guess @@ -0,0 +1 @@ +/usr/share/misc/config.guess \ No newline at end of file diff --git a/sflphone-common/libs/pjproject-1.0.2/config.log b/sflphone-common/libs/pjproject-1.0.2/config.log new file mode 100644 index 0000000000000000000000000000000000000000..dc4f10f2c3fed3bb85071163efb239158e1b3ec2 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/config.log @@ -0,0 +1,2905 @@ +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 = emilou-desktop +uname -m = x86_64 +uname -r = 2.6.28-11-generic +uname -s = Linux +uname -v = #42-Ubuntu SMP Fri Apr 17 01:58:03 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: x86_64-unknown-linux-gnu +aconfigure:1403: checking host system type +aconfigure:1417: result: x86_64-unknown-linux-gnu +aconfigure:1425: checking target system type +aconfigure:1439: result: x86_64-unknown-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 </dev/null >&5 +gcc (Ubuntu 4.3.3-5ubuntu4) 4.3.3 +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 </dev/null >&5 +Using built-in specs. +Target: x86_64-linux-gnu +Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.3-5ubuntu4' --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 --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu +Thread model: posix +gcc version 4.3.3 (Ubuntu 4.3.3-5ubuntu4) +aconfigure:1794: $? = 0 +aconfigure:1796: gcc -V </dev/null >&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 </dev/null >&5 +g++ (Ubuntu 4.3.3-5ubuntu4) 4.3.3 +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 </dev/null >&5 +Using built-in specs. +Target: x86_64-linux-gnu +Configured with: ../src/configure -v --with-pkgversion='Ubuntu 4.3.3-5ubuntu4' --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 --with-tune=generic --enable-checking=release --build=x86_64-linux-gnu --host=x86_64-linux-gnu --target=x86_64-linux-gnu +Thread model: posix +gcc version 4.3.3 (Ubuntu 4.3.3-5ubuntu4) +aconfigure:2502: $? = 0 +aconfigure:2504: g++ -V </dev/null >&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 <stdlib.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' +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 <stdlib.h> +| 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 +aconfigure:3400: $? = 0 +aconfigure:3404: test -z + || test ! -s conftest.err +aconfigure:3407: $? = 0 +aconfigure:3410: test -s conftest +aconfigure:3413: $? = 0 +aconfigure:3426: result: yes +aconfigure:3437: checking for uuid_generate in -luuid +aconfigure:3499: result: yes +aconfigure:3506: result: Setting PJ_M_NAME to x86_64 +aconfigure:3513: checking memory alignment +aconfigure:3521: result: 8 bytes +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:25: error: 'not' undeclared (first use in this function) +conftest.c:25: error: (Each undeclared identifier is reported only once +conftest.c:25: error: for each function it appears in.) +conftest.c:25: 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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| /* end confdefs.h. */ +| #include <sys/types.h> +| #include <sys/param.h> +| +| 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 -luuid -lnsl -lrt -lpthread >&5 +conftest.c:27: 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:21: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| #include <ac_nonexistent.h> +aconfigure:4032: result: gcc -E +aconfigure:4056: gcc -E conftest.c +aconfigure:4062: $? = 0 +aconfigure:4094: gcc -E conftest.c +conftest.c:21: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #define PJ_LINUX 1 +| #define PJ_HAS_FLOATING_POINT 1 +| #define HAVE_LIBM 1 +| /* end confdefs.h. */ +| #include <ac_nonexistent.h> +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 -luuid -lnsl -lrt -lpthread >&5 +conftest.c: In function 'main': +conftest.c:38: 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:93: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 <stdio.h> +| #if HAVE_SYS_TYPES_H +| # include <sys/types.h> +| #endif +| #if HAVE_SYS_STAT_H +| # include <sys/stat.h> +| #endif +| #if STDC_HEADERS +| # include <stdlib.h> +| # include <stddef.h> +| #else +| # if HAVE_STDLIB_H +| # include <stdlib.h> +| # endif +| #endif +| #if HAVE_STRING_H +| # if !STDC_HEADERS && HAVE_MEMORY_H +| # include <memory.h> +| # endif +| # include <string.h> +| #endif +| #if HAVE_STRINGS_H +| # include <strings.h> +| #endif +| #if HAVE_INTTYPES_H +| # include <inttypes.h> +| #else +| # if HAVE_STDINT_H +| # include <stdint.h> +| # endif +| #endif +| #if HAVE_UNISTD_H +| # include <unistd.h> +| #endif +| #include <winsock.h> +aconfigure:8434: result: no +aconfigure:8438: checking winsock.h presence +aconfigure:8448: gcc -E conftest.c +conftest.c:59: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 <winsock.h> +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:93: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 <stdio.h> +| #if HAVE_SYS_TYPES_H +| # include <sys/types.h> +| #endif +| #if HAVE_SYS_STAT_H +| # include <sys/stat.h> +| #endif +| #if STDC_HEADERS +| # include <stdlib.h> +| # include <stddef.h> +| #else +| # if HAVE_STDLIB_H +| # include <stdlib.h> +| # endif +| #endif +| #if HAVE_STRING_H +| # if !STDC_HEADERS && HAVE_MEMORY_H +| # include <memory.h> +| # endif +| # include <string.h> +| #endif +| #if HAVE_STRINGS_H +| # include <strings.h> +| #endif +| #if HAVE_INTTYPES_H +| # include <inttypes.h> +| #else +| # if HAVE_STDINT_H +| # include <stdint.h> +| # endif +| #endif +| #if HAVE_UNISTD_H +| # include <unistd.h> +| #endif +| #include <winsock2.h> +aconfigure:8579: result: no +aconfigure:8583: checking winsock2.h presence +aconfigure:8593: gcc -E conftest.c +conftest.c:59: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 <winsock2.h> +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:66: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 <winsock2.h> +| #elif PJ_HAS_WINSOCK_H +| # include <winsock.h> +| #endif +| +| +| #include <mswsock.h> +aconfigure:8724: result: no +aconfigure:8744: checking ws2tcpip.h usability +aconfigure:8756: gcc -c -O2 conftest.c >&5 +conftest.c:93: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 <stdio.h> +| #if HAVE_SYS_TYPES_H +| # include <sys/types.h> +| #endif +| #if HAVE_SYS_STAT_H +| # include <sys/stat.h> +| #endif +| #if STDC_HEADERS +| # include <stdlib.h> +| # include <stddef.h> +| #else +| # if HAVE_STDLIB_H +| # include <stdlib.h> +| # endif +| #endif +| #if HAVE_STRING_H +| # if !STDC_HEADERS && HAVE_MEMORY_H +| # include <memory.h> +| # endif +| # include <string.h> +| #endif +| #if HAVE_STRINGS_H +| # include <strings.h> +| #endif +| #if HAVE_INTTYPES_H +| # include <inttypes.h> +| #else +| # if HAVE_STDINT_H +| # include <stdint.h> +| # endif +| #endif +| #if HAVE_UNISTD_H +| # include <unistd.h> +| #endif +| #include <ws2tcpip.h> +aconfigure:8785: result: no +aconfigure:8789: checking ws2tcpip.h presence +aconfigure:8799: gcc -E conftest.c +conftest.c:59: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 <ws2tcpip.h> +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 +aconfigure:8907: $? = 0 +aconfigure:8911: test -z + || test ! -s conftest.err +aconfigure:8914: $? = 0 +aconfigure:8917: test -s conftest.o +aconfigure:8920: $? = 0 +aconfigure:8930: result: yes +aconfigure:8934: checking uuid/uuid.h presence +aconfigure:8944: gcc -E conftest.c +aconfigure:8950: $? = 0 +aconfigure:8970: result: yes +aconfigure:9005: checking for uuid/uuid.h +aconfigure:9012: result: yes +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 x86_64-unknown-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:77: 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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 "x86_64-unknown-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 <sys/types.h> +| #include <sys/socket.h> +| #include <netinet/in.h> +| #include <arpa/inet.h> +| 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:77: error: 'PTHREAD_MUTEX_FAST_NP' undeclared (first use in this function) +conftest.c:77: error: (Each undeclared identifier is reported only once +conftest.c:77: 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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 "x86_64-unknown-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 <pthread.h> +| 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:78: 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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 "x86_64-unknown-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 <pthread.h> +| 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:107: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 "x86_64-unknown-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 <stdio.h> +| #if HAVE_SYS_TYPES_H +| # include <sys/types.h> +| #endif +| #if HAVE_SYS_STAT_H +| # include <sys/stat.h> +| #endif +| #if STDC_HEADERS +| # include <stdlib.h> +| # include <stddef.h> +| #else +| # if HAVE_STDLIB_H +| # include <stdlib.h> +| # endif +| #endif +| #if HAVE_STRING_H +| # if !STDC_HEADERS && HAVE_MEMORY_H +| # include <memory.h> +| # endif +| # include <string.h> +| #endif +| #if HAVE_STRINGS_H +| # include <strings.h> +| #endif +| #if HAVE_INTTYPES_H +| # include <inttypes.h> +| #else +| # if HAVE_STDINT_H +| # include <stdint.h> +| # endif +| #endif +| #if HAVE_UNISTD_H +| # include <unistd.h> +| #endif +| #include <machine/soundcard.h> +aconfigure:10145: result: no +aconfigure:10149: checking machine/soundcard.h presence +aconfigure:10159: gcc -E conftest.c +conftest.c:73: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 "x86_64-unknown-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 <machine/soundcard.h> +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:107: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 "x86_64-unknown-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 <stdio.h> +| #if HAVE_SYS_TYPES_H +| # include <sys/types.h> +| #endif +| #if HAVE_SYS_STAT_H +| # include <sys/stat.h> +| #endif +| #if STDC_HEADERS +| # include <stdlib.h> +| # include <stddef.h> +| #else +| # if HAVE_STDLIB_H +| # include <stdlib.h> +| # endif +| #endif +| #if HAVE_STRING_H +| # if !STDC_HEADERS && HAVE_MEMORY_H +| # include <memory.h> +| # endif +| # include <string.h> +| #endif +| #if HAVE_STRINGS_H +| # include <strings.h> +| #endif +| #if HAVE_INTTYPES_H +| # include <inttypes.h> +| #else +| # if HAVE_STDINT_H +| # include <stdint.h> +| # endif +| #endif +| #if HAVE_UNISTD_H +| # include <unistd.h> +| #endif +| #include <openssl/ssl.h> +aconfigure:11034: result: no +aconfigure:11038: checking openssl/ssl.h presence +aconfigure:11048: gcc -E conftest.c +conftest.c:73: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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 "x86_64-unknown-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 <openssl/ssl.h> +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 -luuid -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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 "x86_64-unknown-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 -luuid -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 HAVE_LIBUUID 1 +| #define PJ_M_NAME "x86_64" +| #define PJ_POOL_ALIGNMENT 8 +| #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 "x86_64-unknown-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 emilou-desktop + +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:794: creating pjlib/include/pj/compat/m_auto.h +config.status:794: creating pjmedia/include/pjmedia/config_auto.h +config.status:794: creating pjmedia/include/pjmedia-codec/config_auto.h +config.status:794: creating pjsip/include/pjsip/sip_autoconf.h +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=x86_64-unknown-linux-gnu +ac_cv_build_alias=x86_64-unknown-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=yes +ac_cv_header_winsock2_h=no +ac_cv_header_winsock_h=no +ac_cv_header_ws2tcpip_h=no +ac_cv_host=x86_64-unknown-linux-gnu +ac_cv_host_alias=x86_64-unknown-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=yes +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=x86_64-unknown-linux-gnu +ac_cv_target_alias=x86_64-unknown-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 -luuid -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_uuid.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/emilou/git-repos/sflphone/sflphone-common/libs/pjproject-1.0.2' +ac_pjmedia_snd='pa_unix' +bindir='${exec_prefix}/bin' +build='x86_64-unknown-linux-gnu' +build_alias='' +build_cpu='x86_64' +build_os='linux-gnu' +build_vendor='unknown' +datadir='${prefix}/share' +exec_prefix='${prefix}' +host='x86_64-unknown-linux-gnu' +host_alias='' +host_cpu='x86_64' +host_os='linux-gnu' +host_vendor='unknown' +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='x86_64-unknown-linux-gnu' +target_alias='' +target_cpu='x86_64' +target_os='linux-gnu' +target_vendor='unknown' + +## ----------- ## +## 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_LIBUUID 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 "x86_64" +#define PJ_NATIVE_STRING_IS_UNICODE 0 +#define PJ_OS_NAME "x86_64-unknown-linux-gnu" +#define PJ_POOL_ALIGNMENT 8 +#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/sflphone-common/libs/pjproject-1.0.2/config.status b/sflphone-common/libs/pjproject-1.0.2/config.status new file mode 100755 index 0000000000000000000000000000000000000000..2c61c60623246bb10326e73dc4512833636b35aa --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/config.status @@ -0,0 +1,1075 @@ +#! /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 <bug-autoconf@gnu.org>." +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 -luuid -lnsl -lrt -lpthread -lasound,;t t +s,@build@,x86_64-unknown-linux-gnu,;t t +s,@build_cpu@,x86_64,;t t +s,@build_vendor@,unknown,;t t +s,@build_os@,linux-gnu,;t t +s,@host@,x86_64-unknown-linux-gnu,;t t +s,@host_cpu@,x86_64,;t t +s,@host_vendor@,unknown,;t t +s,@host_os@,linux-gnu,;t t +s,@target@,x86_64-unknown-linux-gnu,;t t +s,@target_cpu@,x86_64,;t t +s,@target_vendor@,unknown,;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/emilou/git-repos/sflphone/sflphone-common/libs/pjproject-1.0.2,;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_uuid.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 <<CEOF +/^[ ]*#[ ]*define/!b +t clr +: clr +${ac_dA}PACKAGE_NAME${ac_dB}PACKAGE_NAME${ac_dC}"pjproject"${ac_dD} +${ac_dA}PACKAGE_TARNAME${ac_dB}PACKAGE_TARNAME${ac_dC}"pjproject"${ac_dD} +${ac_dA}PACKAGE_VERSION${ac_dB}PACKAGE_VERSION${ac_dC}"1.0"${ac_dD} +${ac_dA}PACKAGE_STRING${ac_dB}PACKAGE_STRING${ac_dC}"pjproject 1.0"${ac_dD} +${ac_dA}PACKAGE_BUGREPORT${ac_dB}PACKAGE_BUGREPORT${ac_dC}""${ac_dD} +${ac_dA}HAVE_LIBPTHREAD${ac_dB}HAVE_LIBPTHREAD${ac_dC}1${ac_dD} +${ac_dA}HAVE_LIBRT${ac_dB}HAVE_LIBRT${ac_dC}1${ac_dD} +${ac_dA}HAVE_LIBNSL${ac_dB}HAVE_LIBNSL${ac_dC}1${ac_dD} +${ac_dA}HAVE_LIBUUID${ac_dB}HAVE_LIBUUID${ac_dC}1${ac_dD} +${ac_dA}PJ_M_NAME${ac_dB}PJ_M_NAME${ac_dC}"x86_64"${ac_dD} +${ac_dA}PJ_POOL_ALIGNMENT${ac_dB}PJ_POOL_ALIGNMENT${ac_dC}8${ac_dD} +${ac_dA}PJ_LINUX${ac_dB}PJ_LINUX${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_FLOATING_POINT${ac_dB}PJ_HAS_FLOATING_POINT${ac_dC}1${ac_dD} +${ac_dA}HAVE_LIBM${ac_dB}HAVE_LIBM${ac_dC}1${ac_dD} +${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD} +${ac_dA}HAVE_SYS_TYPES_H${ac_dB}HAVE_SYS_TYPES_H${ac_dC}1${ac_dD} +${ac_dA}HAVE_SYS_STAT_H${ac_dB}HAVE_SYS_STAT_H${ac_dC}1${ac_dD} +${ac_dA}HAVE_STDLIB_H${ac_dB}HAVE_STDLIB_H${ac_dC}1${ac_dD} +${ac_dA}HAVE_STRING_H${ac_dB}HAVE_STRING_H${ac_dC}1${ac_dD} +${ac_dA}HAVE_MEMORY_H${ac_dB}HAVE_MEMORY_H${ac_dC}1${ac_dD} +${ac_dA}HAVE_STRINGS_H${ac_dB}HAVE_STRINGS_H${ac_dC}1${ac_dD} +${ac_dA}HAVE_INTTYPES_H${ac_dB}HAVE_INTTYPES_H${ac_dC}1${ac_dD} +${ac_dA}HAVE_STDINT_H${ac_dB}HAVE_STDINT_H${ac_dC}1${ac_dD} +${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_ARPA_INET_H${ac_dB}PJ_HAS_ARPA_INET_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_ASSERT_H${ac_dB}PJ_HAS_ASSERT_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_CTYPE_H${ac_dB}PJ_HAS_CTYPE_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_ERRNO_H${ac_dB}PJ_HAS_ERRNO_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_FCNTL_H${ac_dB}PJ_HAS_FCNTL_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_LINUX_SOCKET_H${ac_dB}PJ_HAS_LINUX_SOCKET_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_MALLOC_H${ac_dB}PJ_HAS_MALLOC_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_NETDB_H${ac_dB}PJ_HAS_NETDB_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_NETINET_IN_SYSTM_H${ac_dB}PJ_HAS_NETINET_IN_SYSTM_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_NETINET_IN_H${ac_dB}PJ_HAS_NETINET_IN_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_NETINET_IP_H${ac_dB}PJ_HAS_NETINET_IP_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_IFADDRS_H${ac_dB}PJ_HAS_IFADDRS_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_SEMAPHORE_H${ac_dB}PJ_HAS_SEMAPHORE_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_SETJMP_H${ac_dB}PJ_HAS_SETJMP_H${ac_dC}1${ac_dD} +CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in + + cat >$tmp/defines.sed <<CEOF +/^[ ]*#[ ]*define/!b +t clr +: clr +${ac_dA}PJ_HAS_STDARG_H${ac_dB}PJ_HAS_STDARG_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_STDDEF_H${ac_dB}PJ_HAS_STDDEF_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_STDIO_H${ac_dB}PJ_HAS_STDIO_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_STDINT_H${ac_dB}PJ_HAS_STDINT_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_STDLIB_H${ac_dB}PJ_HAS_STDLIB_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_STRING_H${ac_dB}PJ_HAS_STRING_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_SYS_IOCTL_H${ac_dB}PJ_HAS_SYS_IOCTL_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_SYS_SELECT_H${ac_dB}PJ_HAS_SYS_SELECT_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_SYS_SOCKET_H${ac_dB}PJ_HAS_SYS_SOCKET_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_SYS_TIME_H${ac_dB}PJ_HAS_SYS_TIME_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_SYS_TIMEB_H${ac_dB}PJ_HAS_SYS_TIMEB_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_SYS_TYPES_H${ac_dB}PJ_HAS_SYS_TYPES_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_TIME_H${ac_dB}PJ_HAS_TIME_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_UNISTD_H${ac_dB}PJ_HAS_UNISTD_H${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_NET_IF_H${ac_dB}PJ_HAS_NET_IF_H${ac_dC}1${ac_dD} +${ac_dA}PJ_OS_NAME${ac_dB}PJ_OS_NAME${ac_dC}"x86_64-unknown-linux-gnu"${ac_dD} +${ac_dA}PJ_HAS_ERRNO_VAR${ac_dB}PJ_HAS_ERRNO_VAR${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_HIGH_RES_TIMER${ac_dB}PJ_HAS_HIGH_RES_TIMER${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_MALLOC${ac_dB}PJ_HAS_MALLOC${ac_dC}1${ac_dD} +${ac_dA}PJ_NATIVE_STRING_IS_UNICODE${ac_dB}PJ_NATIVE_STRING_IS_UNICODE${ac_dC}0${ac_dD} +${ac_dA}PJ_ATOMIC_VALUE_TYPE${ac_dB}PJ_ATOMIC_VALUE_TYPE${ac_dC}long${ac_dD} +${ac_dA}PJ_SOCK_HAS_INET_ATON${ac_dB}PJ_SOCK_HAS_INET_ATON${ac_dC}1${ac_dD} +${ac_dA}PJ_SOCK_HAS_INET_PTON${ac_dB}PJ_SOCK_HAS_INET_PTON${ac_dC}1${ac_dD} +${ac_dA}PJ_SOCK_HAS_INET_NTOP${ac_dB}PJ_SOCK_HAS_INET_NTOP${ac_dC}1${ac_dD} +${ac_dA}PJ_SOCK_HAS_GETADDRINFO${ac_dB}PJ_SOCK_HAS_GETADDRINFO${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_SOCKLEN_T${ac_dB}PJ_HAS_SOCKLEN_T${ac_dC}1${ac_dD} +${ac_dA}PJ_HAS_SO_ERROR${ac_dB}PJ_HAS_SO_ERROR${ac_dC}1${ac_dD} +${ac_dA}PJ_EMULATE_RWMUTEX${ac_dB}PJ_EMULATE_RWMUTEX${ac_dC}0${ac_dD} +${ac_dA}PJ_SELECT_NEEDS_NFDS${ac_dB}PJ_SELECT_NEEDS_NFDS${ac_dC}0${ac_dD} +${ac_dA}PJ_THREAD_SET_STACK_SIZE${ac_dB}PJ_THREAD_SET_STACK_SIZE${ac_dC}0${ac_dD} +${ac_dA}PJ_THREAD_ALLOCATE_STACK${ac_dB}PJ_THREAD_ALLOCATE_STACK${ac_dC}0${ac_dD} +${ac_dA}PJ_BLOCKING_ERROR_VAL${ac_dB}PJ_BLOCKING_ERROR_VAL${ac_dC}EAGAIN${ac_dD} +${ac_dA}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_dB}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_dC}EINPROGRESS${ac_dD} +CEOF + sed -f $tmp/defines.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in + + fi # grep + + # Handle all the #undef templates + cat >$tmp/undefs.sed <<CEOF +/^[ ]*#[ ]*undef/!b +t clr +: clr +${ac_uA}PACKAGE_NAME${ac_uB}PACKAGE_NAME${ac_uC}"pjproject"${ac_uD} +${ac_uA}PACKAGE_TARNAME${ac_uB}PACKAGE_TARNAME${ac_uC}"pjproject"${ac_uD} +${ac_uA}PACKAGE_VERSION${ac_uB}PACKAGE_VERSION${ac_uC}"1.0"${ac_uD} +${ac_uA}PACKAGE_STRING${ac_uB}PACKAGE_STRING${ac_uC}"pjproject 1.0"${ac_uD} +${ac_uA}PACKAGE_BUGREPORT${ac_uB}PACKAGE_BUGREPORT${ac_uC}""${ac_uD} +${ac_uA}HAVE_LIBPTHREAD${ac_uB}HAVE_LIBPTHREAD${ac_uC}1${ac_uD} +${ac_uA}HAVE_LIBRT${ac_uB}HAVE_LIBRT${ac_uC}1${ac_uD} +${ac_uA}HAVE_LIBNSL${ac_uB}HAVE_LIBNSL${ac_uC}1${ac_uD} +${ac_uA}HAVE_LIBUUID${ac_uB}HAVE_LIBUUID${ac_uC}1${ac_uD} +${ac_uA}PJ_M_NAME${ac_uB}PJ_M_NAME${ac_uC}"x86_64"${ac_uD} +${ac_uA}PJ_POOL_ALIGNMENT${ac_uB}PJ_POOL_ALIGNMENT${ac_uC}8${ac_uD} +${ac_uA}PJ_LINUX${ac_uB}PJ_LINUX${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_FLOATING_POINT${ac_uB}PJ_HAS_FLOATING_POINT${ac_uC}1${ac_uD} +${ac_uA}HAVE_LIBM${ac_uB}HAVE_LIBM${ac_uC}1${ac_uD} +${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD} +${ac_uA}HAVE_SYS_TYPES_H${ac_uB}HAVE_SYS_TYPES_H${ac_uC}1${ac_uD} +${ac_uA}HAVE_SYS_STAT_H${ac_uB}HAVE_SYS_STAT_H${ac_uC}1${ac_uD} +${ac_uA}HAVE_STDLIB_H${ac_uB}HAVE_STDLIB_H${ac_uC}1${ac_uD} +${ac_uA}HAVE_STRING_H${ac_uB}HAVE_STRING_H${ac_uC}1${ac_uD} +${ac_uA}HAVE_MEMORY_H${ac_uB}HAVE_MEMORY_H${ac_uC}1${ac_uD} +${ac_uA}HAVE_STRINGS_H${ac_uB}HAVE_STRINGS_H${ac_uC}1${ac_uD} +${ac_uA}HAVE_INTTYPES_H${ac_uB}HAVE_INTTYPES_H${ac_uC}1${ac_uD} +${ac_uA}HAVE_STDINT_H${ac_uB}HAVE_STDINT_H${ac_uC}1${ac_uD} +${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_ARPA_INET_H${ac_uB}PJ_HAS_ARPA_INET_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_ASSERT_H${ac_uB}PJ_HAS_ASSERT_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_CTYPE_H${ac_uB}PJ_HAS_CTYPE_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_ERRNO_H${ac_uB}PJ_HAS_ERRNO_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_FCNTL_H${ac_uB}PJ_HAS_FCNTL_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_LINUX_SOCKET_H${ac_uB}PJ_HAS_LINUX_SOCKET_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_MALLOC_H${ac_uB}PJ_HAS_MALLOC_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_NETDB_H${ac_uB}PJ_HAS_NETDB_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_NETINET_IN_SYSTM_H${ac_uB}PJ_HAS_NETINET_IN_SYSTM_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_NETINET_IN_H${ac_uB}PJ_HAS_NETINET_IN_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_NETINET_IP_H${ac_uB}PJ_HAS_NETINET_IP_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_IFADDRS_H${ac_uB}PJ_HAS_IFADDRS_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_SEMAPHORE_H${ac_uB}PJ_HAS_SEMAPHORE_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_SETJMP_H${ac_uB}PJ_HAS_SETJMP_H${ac_uC}1${ac_uD} +CEOF + sed -f $tmp/undefs.sed $tmp/in >$tmp/out + rm -f $tmp/in + mv $tmp/out $tmp/in + + cat >$tmp/undefs.sed <<CEOF +/^[ ]*#[ ]*undef/!b +t clr +: clr +${ac_uA}PJ_HAS_STDARG_H${ac_uB}PJ_HAS_STDARG_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_STDDEF_H${ac_uB}PJ_HAS_STDDEF_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_STDIO_H${ac_uB}PJ_HAS_STDIO_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_STDINT_H${ac_uB}PJ_HAS_STDINT_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_STDLIB_H${ac_uB}PJ_HAS_STDLIB_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_STRING_H${ac_uB}PJ_HAS_STRING_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_SYS_IOCTL_H${ac_uB}PJ_HAS_SYS_IOCTL_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_SYS_SELECT_H${ac_uB}PJ_HAS_SYS_SELECT_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_SYS_SOCKET_H${ac_uB}PJ_HAS_SYS_SOCKET_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_SYS_TIME_H${ac_uB}PJ_HAS_SYS_TIME_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_SYS_TIMEB_H${ac_uB}PJ_HAS_SYS_TIMEB_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_SYS_TYPES_H${ac_uB}PJ_HAS_SYS_TYPES_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_TIME_H${ac_uB}PJ_HAS_TIME_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_UNISTD_H${ac_uB}PJ_HAS_UNISTD_H${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_NET_IF_H${ac_uB}PJ_HAS_NET_IF_H${ac_uC}1${ac_uD} +${ac_uA}PJ_OS_NAME${ac_uB}PJ_OS_NAME${ac_uC}"x86_64-unknown-linux-gnu"${ac_uD} +${ac_uA}PJ_HAS_ERRNO_VAR${ac_uB}PJ_HAS_ERRNO_VAR${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_HIGH_RES_TIMER${ac_uB}PJ_HAS_HIGH_RES_TIMER${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_MALLOC${ac_uB}PJ_HAS_MALLOC${ac_uC}1${ac_uD} +${ac_uA}PJ_NATIVE_STRING_IS_UNICODE${ac_uB}PJ_NATIVE_STRING_IS_UNICODE${ac_uC}0${ac_uD} +${ac_uA}PJ_ATOMIC_VALUE_TYPE${ac_uB}PJ_ATOMIC_VALUE_TYPE${ac_uC}long${ac_uD} +${ac_uA}PJ_SOCK_HAS_INET_ATON${ac_uB}PJ_SOCK_HAS_INET_ATON${ac_uC}1${ac_uD} +${ac_uA}PJ_SOCK_HAS_INET_PTON${ac_uB}PJ_SOCK_HAS_INET_PTON${ac_uC}1${ac_uD} +${ac_uA}PJ_SOCK_HAS_INET_NTOP${ac_uB}PJ_SOCK_HAS_INET_NTOP${ac_uC}1${ac_uD} +${ac_uA}PJ_SOCK_HAS_GETADDRINFO${ac_uB}PJ_SOCK_HAS_GETADDRINFO${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_SOCKLEN_T${ac_uB}PJ_HAS_SOCKLEN_T${ac_uC}1${ac_uD} +${ac_uA}PJ_HAS_SO_ERROR${ac_uB}PJ_HAS_SO_ERROR${ac_uC}1${ac_uD} +${ac_uA}PJ_EMULATE_RWMUTEX${ac_uB}PJ_EMULATE_RWMUTEX${ac_uC}0${ac_uD} +${ac_uA}PJ_SELECT_NEEDS_NFDS${ac_uB}PJ_SELECT_NEEDS_NFDS${ac_uC}0${ac_uD} +${ac_uA}PJ_THREAD_SET_STACK_SIZE${ac_uB}PJ_THREAD_SET_STACK_SIZE${ac_uC}0${ac_uD} +${ac_uA}PJ_THREAD_ALLOCATE_STACK${ac_uB}PJ_THREAD_ALLOCATE_STACK${ac_uC}0${ac_uD} +${ac_uA}PJ_BLOCKING_ERROR_VAL${ac_uB}PJ_BLOCKING_ERROR_VAL${ac_uC}EAGAIN${ac_uD} +${ac_uA}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_uB}PJ_BLOCKING_CONNECT_ERROR_VAL${ac_uC}EINPROGRESS${ac_uD} +s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, +CEOF + sed -f $tmp/undefs.sed $tmp/in >$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/sflphone-common/libs/pjproject-1.0.2/config.sub b/sflphone-common/libs/pjproject-1.0.2/config.sub new file mode 120000 index 0000000000000000000000000000000000000000..04fd6e297dd1d34bdeef7379188d6f7f61419426 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/config.sub @@ -0,0 +1 @@ +/usr/share/misc/config.sub \ No newline at end of file diff --git a/sflphone-common/libs/pjproject-1.0.1/configure b/sflphone-common/libs/pjproject-1.0.2/configure similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/configure rename to sflphone-common/libs/pjproject-1.0.2/configure diff --git a/sflphone-common/libs/pjproject-1.0.1/configure-legacy b/sflphone-common/libs/pjproject-1.0.2/configure-legacy similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/configure-legacy rename to sflphone-common/libs/pjproject-1.0.2/configure-legacy diff --git a/sflphone-common/libs/pjproject-1.0.1/configure.ac b/sflphone-common/libs/pjproject-1.0.2/configure.ac similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/configure.ac rename to sflphone-common/libs/pjproject-1.0.2/configure.ac diff --git a/sflphone-common/libs/pjproject-1.0.1/install-sh b/sflphone-common/libs/pjproject-1.0.2/install-sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/install-sh rename to sflphone-common/libs/pjproject-1.0.2/install-sh diff --git a/sflphone-common/libs/pjproject-1.0.1/libpj-sfl.pc.in b/sflphone-common/libs/pjproject-1.0.2/libpj-sfl.pc.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/libpj-sfl.pc.in rename to sflphone-common/libs/pjproject-1.0.2/libpj-sfl.pc.in diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu new file mode 100755 index 0000000000000000000000000000000000000000..d29a2047c0c9e32e4549e062089937381641a02b Binary files /dev/null and b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/bin/pjlib-util-test-x86_64-unknown-linux-gnu differ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/Makefile b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/Makefile rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/os-auto.mak rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-rtems.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/os-rtems.mak rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/os-rtems.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.dsp b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.dsw b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.dsw rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.dsw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util_test.dsp b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util_test.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util_test.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/pjlib_util_test.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/pjlib_util_test.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_test_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/build/wince-evc4/pjlib_util_wince.vcw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.cfg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/docs/doxygen.cfg rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.cfg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/docs/doxygen.css b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.css similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/docs/doxygen.css rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/doxygen.css diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/docs/footer.html b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/footer.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/docs/footer.html rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/footer.html diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/docs/header.html b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/header.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/docs/header.html rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/docs/header.html diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/base64.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/base64.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/base64.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/base64.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/config.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/config.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/crc32.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/crc32.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/crc32.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/crc32.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/dns.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/dns.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/dns_server.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns_server.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/dns_server.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/dns_server.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/errno.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/errno.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/getopt.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/getopt.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/getopt.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/getopt.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/hmac_md5.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_md5.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/hmac_md5.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_md5.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/hmac_sha1.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_sha1.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/hmac_sha1.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/hmac_sha1.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/md5.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/md5.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/md5.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/md5.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/pcap.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/pcap.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/pcap.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/pcap.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/resolver.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/resolver.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/resolver.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/resolver.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_bitwise.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner_cis_uint.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_uint.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/scanner_cis_uint.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/scanner_cis_uint.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/sha1.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/sha1.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/sha1.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/sha1.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/srv_resolver.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/srv_resolver.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/srv_resolver.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/srv_resolver.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/string.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/string.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/string.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/string.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/stun_simple.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/stun_simple.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/stun_simple.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/stun_simple.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/types.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/types.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/xml.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/xml.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/include/pjlib-util/xml.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/include/pjlib-util/xml.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/encryption.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/encryption.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/encryption.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/encryption.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main.c index ee025496d90403f15937b87177314773ca104ce7..51a349b86bd1b7abdd0479383aec0f46bedddd31 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main.c @@ -54,7 +54,8 @@ int main(int argc, char *argv[]) char s[10]; puts("Press ENTER to quit"); - fgets(s, sizeof(s), stdin); + if (fgets(s, sizeof(s), stdin) == NULL) + return rc; } return rc; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main_rtems.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_rtems.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main_rtems.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_rtems.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/main_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/main_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/resolver_test.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/resolver_test.c similarity index 95% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/resolver_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/resolver_test.c index a65878ffa8031864e5c51f42b98057acbc0732f5..1a32863f4c760e9cad9987b8ff023d82bc48b75a 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/resolver_test.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/resolver_test.c @@ -1,4 +1,4 @@ -/* $Id: resolver_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: resolver_test.c 2407 2009-01-01 20:56:36Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -702,13 +702,14 @@ static void dns_callback(void *user_data, { PJ_UNUSED_ARG(user_data); - pj_assert(status == PJ_SUCCESS); - pj_assert(resp); - pj_assert(resp->hdr.anscount == 1); - pj_assert(resp->ans[0].type == PJ_DNS_TYPE_A); - pj_assert(resp->ans[0].rdata.a.ip_addr.s_addr == IP_ADDR0); - pj_sem_post(sem); + + PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return); + PJ_ASSERT_ON_FAIL(resp, return); + PJ_ASSERT_ON_FAIL(resp->hdr.anscount == 1, return); + PJ_ASSERT_ON_FAIL(resp->ans[0].type == PJ_DNS_TYPE_A, return); + PJ_ASSERT_ON_FAIL(resp->ans[0].rdata.a.ip_addr.s_addr == IP_ADDR0, return); + } @@ -778,9 +779,10 @@ static void dns_callback_1b(void *user_data, PJ_UNUSED_ARG(user_data); PJ_UNUSED_ARG(resp); - pj_assert(status == PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN)); - pj_sem_post(sem); + + PJ_ASSERT_ON_FAIL(status==PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN), + return); } @@ -1014,16 +1016,20 @@ static void srv_cb_1(void *user_data, { PJ_UNUSED_ARG(user_data); - pj_assert(status == PJ_SUCCESS); - pj_assert(rec->count == 1); - pj_assert(rec->entry[0].priority == 1); - pj_assert(rec->entry[0].weight == 2); - pj_assert(pj_strcmp2(&rec->entry[0].server.name, "sip.somedomain.com")==0); - pj_assert(pj_strcmp2(&rec->entry[0].server.alias, "sipalias.somedomain.com")==0); - pj_assert(rec->entry[0].server.addr[0].s_addr == IP_ADDR1); - pj_assert(rec->entry[0].port == PORT1); - pj_sem_post(sem); + + PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return); + PJ_ASSERT_ON_FAIL(rec->count == 1, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].priority == 1, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].weight == 2, return); + PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.name, "sip.somedomain.com")==0, + return); + PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.alias, "sipalias.somedomain.com")==0, + return); + PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[0].s_addr == IP_ADDR1, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].port == PORT1, return); + + } static void srv_cb_1b(void *user_data, @@ -1032,10 +1038,11 @@ static void srv_cb_1b(void *user_data, { PJ_UNUSED_ARG(user_data); - pj_assert(status == PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN)); - pj_assert(rec->count == 0); - pj_sem_post(sem); + + PJ_ASSERT_ON_FAIL(status==PJ_STATUS_FROM_DNS_RCODE(PJ_DNS_RCODE_NXDOMAIN), + return); + PJ_ASSERT_ON_FAIL(rec->count == 0, return); } static int srv_resolver_test(void) @@ -1175,16 +1182,18 @@ static void srv_cb_2(void *user_data, { PJ_UNUSED_ARG(user_data); - pj_assert(status == PJ_SUCCESS); - pj_assert(rec->count == 1); - pj_assert(rec->entry[0].priority == 0); - pj_assert(rec->entry[0].weight == 0); - pj_assert(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0); - pj_assert(pj_strcmp2(&rec->entry[0].server.alias, "sipalias01." TARGET)==0); - pj_assert(rec->entry[0].server.addr[0].s_addr == IP_ADDR2); - pj_assert(rec->entry[0].port == PORT2); - pj_sem_post(sem); + + PJ_ASSERT_ON_FAIL(status == PJ_SUCCESS, return); + PJ_ASSERT_ON_FAIL(rec->count == 1, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].priority == 0, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].weight == 0, return); + PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.name, TARGET)==0, + return); + PJ_ASSERT_ON_FAIL(pj_strcmp2(&rec->entry[0].server.alias, "sipalias01." TARGET)==0, + return); + PJ_ASSERT_ON_FAIL(rec->entry[0].server.addr[0].s_addr == IP_ADDR2, return); + PJ_ASSERT_ON_FAIL(rec->entry[0].port == PORT2, return); } static int srv_resolver_fallback_test(void) @@ -1306,9 +1315,12 @@ static void srv_cb_3(void *user_data, unsigned i; PJ_UNUSED_ARG(user_data); + PJ_UNUSED_ARG(status); + PJ_UNUSED_ARG(rec); pj_assert(status == PJ_SUCCESS); pj_assert(rec->count == PJ_DNS_SRV_MAX_ADDR); + for (i=0; i<PJ_DNS_SRV_MAX_ADDR; ++i) { unsigned j; @@ -1362,11 +1374,6 @@ int resolver_test(void) { int rc; -#ifdef NDEBUG - PJ_LOG(3,(THIS_FILE, " error: NDEBUG is declared")); - return -1; -#endif - rc = init(); if (rc != 0) goto on_error; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/stun.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/stun.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/stun.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/stun.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/test.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/test.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/test.h b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/test.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/test.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/xml.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/xml.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util-test/xml.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util-test/xml.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/base64.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/base64.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/base64.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/base64.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/crc32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/crc32.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/crc32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/crc32.c index d05779ba78dbb1953738af3ff38935c7a9d23641..6467072071658e7c69ca938338578d1722c594f1 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/crc32.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/crc32.c @@ -1,4 +1,4 @@ -/* $Id: crc32.c 1731 2008-01-23 20:23:12Z bennylp $ */ +/* $Id: crc32.c 2530 2009-03-23 12:55:00Z bennylp $ */ /* * This is an implementation of CRC32. See ISO 3309 and ITU-T V.42 * for a formal specification @@ -22,6 +22,7 @@ #define CRC32_INDEX(c) (c & 0xff) #define CRC32_SHIFTED(c) (c >> 8) +#define CRC32_SWAP(c) (c) static const pj_uint32_t crc_tab[] = { 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, @@ -82,6 +83,10 @@ static const pj_uint32_t crc_tab[] = { #elif defined(PJ_IS_BIG_ENDIAN) && PJ_IS_BIG_ENDIAN != 0 #define CRC32_INDEX(c) (c >> 24) #define CRC32_SHIFTED(c) (c << 8) +#define CRC32_SWAP(c) ((((c) & 0xff000000) >> 24) | \ + (((c) & 0x00ff0000) >> 8) | \ + (((c) & 0x0000ff00) << 8) | \ + (((c) & 0x000000ff) << 24)) static const pj_uint32_t crc_tab[] = { 0x00000000L, 0x96300777L, 0x2c610eeeL, 0xba510999L, 0x19c46d07L, @@ -179,7 +184,7 @@ PJ_DEF(pj_uint32_t) pj_crc32_update(pj_crc32_context *ctx, PJ_DEF(pj_uint32_t) pj_crc32_final(pj_crc32_context *ctx) { - return ctx->crc_state; + return CRC32_SWAP(ctx->crc_state); } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns_dump.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_dump.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns_dump.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_dump.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns_server.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_server.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/dns_server.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/dns_server.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/errno.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/errno.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/getopt.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/getopt.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/getopt.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/getopt.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/hmac_md5.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_md5.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/hmac_md5.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_md5.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/hmac_sha1.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_sha1.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/hmac_sha1.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/hmac_sha1.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/md5.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/md5.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/md5.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/md5.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/pcap.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/pcap.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/pcap.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/pcap.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/resolver.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/resolver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/resolver.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/resolver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner.c index d53f6dc35ba4557740ac937f6ad8e0f14b355904..a0aa7305225e8ed78ca9adca9784b12b0d814dd0 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner.c @@ -1,4 +1,4 @@ -/* $Id: scanner.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: scanner.c 2538 2009-03-23 13:14:26Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -28,7 +28,7 @@ #define PJ_SCAN_IS_SPACE(c) ((c)==' ' || (c)=='\t') #define PJ_SCAN_IS_NEWLINE(c) ((c)=='\r' || (c)=='\n') #define PJ_SCAN_IS_PROBABLY_SPACE(c) ((c) <= 32) -#define PJ_SCAN_CHECK_EOF(s) (*s) +#define PJ_SCAN_CHECK_EOF(s) (s != scanner->end) #if defined(PJ_SCANNER_USE_BITWISE) && PJ_SCANNER_USE_BITWISE != 0 @@ -375,7 +375,7 @@ PJ_DEF(void) pj_scan_get_quotes(pj_scanner *scanner, */ do { /* loop until end_quote is found. */ - while (*s && *s != '\n' && *s != end_quote[qpair]) { + while (PJ_SCAN_CHECK_EOF(s) && *s != '\n' && *s != end_quote[qpair]) { ++s; } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_bitwise.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner_cis_uint.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_uint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/scanner_cis_uint.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/scanner_cis_uint.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/sha1.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/sha1.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/sha1.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/sha1.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/srv_resolver.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/srv_resolver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/srv_resolver.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/srv_resolver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/string.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/string.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/string.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/string.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/stun_simple.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/stun_simple.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/stun_simple_client.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple_client.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/stun_simple_client.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/stun_simple_client.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/symbols.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/symbols.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/symbols.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/symbols.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/xml.c b/sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/xml.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib-util/src/pjlib-util/xml.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib-util/src/pjlib-util/xml.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/bin/pjlib-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjlib/bin/pjlib-test-x86_64-unknown-linux-gnu new file mode 100755 index 0000000000000000000000000000000000000000..c6ed11cacf80b33d2f1413c74947812304dcb047 Binary files /dev/null and b/sflphone-common/libs/pjproject-1.0.2/pjlib/bin/pjlib-test-x86_64-unknown-linux-gnu differ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/Makefile b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/Makefile rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak new file mode 100644 index 0000000000000000000000000000000000000000..126fe0993bef586c6b993db41f27a391b0682806 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/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_uuid.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 -luuid -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/sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-darwinos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-darwinos.mak rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-darwinos.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-linux-kernel.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux-kernel.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-linux-kernel.mak rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux-kernel.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-linux.mak rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-linux.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-rtems.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-rtems.mak rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-rtems.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-sunos.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-sunos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-sunos.mak rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-sunos.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/os-win32.mak rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/os-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib++-test.dsp b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++-test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib++-test.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++-test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib++.dsp b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib++.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib++.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib.dsp b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib.dsw b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib.dsw rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.dsw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib_samples.dsp b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib_samples.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib_samples.mak b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib_samples.mak rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_samples.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib_test.dsp b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib_test.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib_test.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/pjlib_test.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/pjlib_test.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_test_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_test_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_test_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_test_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_wince.vcw b/sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/build/wince-evc4/pjlib_wince.vcw rename to sflphone-common/libs/pjproject-1.0.2/pjlib/build/wince-evc4/pjlib_wince.vcw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.cfg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/docs/doxygen.cfg rename to sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.cfg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/docs/doxygen.css b/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.css similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/docs/doxygen.css rename to sflphone-common/libs/pjproject-1.0.2/pjlib/docs/doxygen.css diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/docs/footer.html b/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/footer.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/docs/footer.html rename to sflphone-common/libs/pjproject-1.0.2/pjlib/docs/footer.html diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/docs/header.html b/sflphone-common/libs/pjproject-1.0.2/pjlib/docs/header.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/docs/header.html rename to sflphone-common/libs/pjproject-1.0.2/pjlib/docs/header.html diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/file.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/file.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/file.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/file.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/hash.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/hash.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/hash.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/hash.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/list.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/list.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/list.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/list.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/lock.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/lock.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/lock.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/lock.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/os.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/os.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/os.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/os.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/pool.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/pool.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/pool.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/pool.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/proactor.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/proactor.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/proactor.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/proactor.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/scanner.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/scanner.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/scanner.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/scanner.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/sock.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/sock.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/sock.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/sock.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/string.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/string.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/string.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/string.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/timer.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/timer.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/timer.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/timer.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/tree.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/tree.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/tree.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/tree.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/types.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/types.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj++/types.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj++/types.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/activesock.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/activesock.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/activesock.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/activesock.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/addr_resolv.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/addr_resolv.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/addr_resolv.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/addr_resolv.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/array.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/array.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/array.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/array.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/assert.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/assert.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/assert.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/assert.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/assert.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/assert.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/assert.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/assert.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_armcc.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_armcc.h similarity index 94% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_armcc.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_armcc.h index 45420b5bbac3f6bc1a618fb2458426d3817e7234..7bf1c91bad1be4426dbacfc27983f18394a9f931 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_armcc.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_armcc.h @@ -1,4 +1,4 @@ -/* $Id: cc_armcc.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: cc_armcc.h 2407 2009-01-01 20:56:36Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -51,5 +51,7 @@ typedef unsigned long long pj_uint64_t; #define PJ_INT64_FMT "L" +#define PJ_UNREACHED(x) + #endif /* __PJ_COMPAT_CC_ARMCC_H__ */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_codew.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_codew.h similarity index 94% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_codew.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_codew.h index 54ca3260debfd2dc1246828e40f833edb3f753ba..79730cb398409cbbd5bc9c08bd6e91e7e0577529 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_codew.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_codew.h @@ -1,4 +1,4 @@ -/* $Id: cc_codew.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: cc_codew.h 2407 2009-01-01 20:56:36Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -49,6 +49,7 @@ typedef unsigned long long pj_uint64_t; #define PJ_UINT64(val) val##LLU #define PJ_INT64_FMT "L" +#define PJ_UNREACHED(x) #endif /* __PJ_COMPAT_CC_CODEW_H__ */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_gcc.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcc.h similarity index 95% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_gcc.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcc.h index 05909514419f001a2587b7662a6da3127faec5d8..78d7e8c92174562657ecd38f6ff364ed388058c9 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_gcc.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcc.h @@ -1,4 +1,4 @@ -/* $Id: cc_gcc.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: cc_gcc.h 2407 2009-01-01 20:56:36Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -69,6 +69,7 @@ # define PJ_HAS_BZERO 1 #endif +#define PJ_UNREACHED(x) #endif /* __PJ_COMPAT_CC_GCC_H__ */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_gcce.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcce.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_gcce.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_gcce.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_msvc.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_msvc.h similarity index 87% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_msvc.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_msvc.h index 13825f2f5cddc8674ba7162448ca6f5688023772..a7c50375d8df3aba0fa0c8269c14133bb155254b 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_msvc.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_msvc.h @@ -1,4 +1,4 @@ -/* $Id: cc_msvc.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: cc_msvc.h 2407 2009-01-01 20:56:36Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -38,6 +38,13 @@ #if PJ_CC_VER_1 >= 8 && !defined(_CRT_SECURE_NO_DEPRECATE) # define _CRT_SECURE_NO_DEPRECATE #endif +#if PJ_CC_VER_1 >= 8 && !defined(_CRT_SECURE_NO_WARNINGS) +# define _CRT_SECURE_NO_WARNINGS + /* The above doesn't seem to work, at least on VS2005, so lets use + * this construct as well. + */ +# pragma warning(disable: 4996) +#endif #pragma warning(disable: 4127) // conditional expression is constant #pragma warning(disable: 4611) // not wise to mix setjmp with C++ @@ -71,5 +78,7 @@ typedef unsigned __int64 pj_uint64_t; #define PJ_UINT64(val) val##ui64 #define PJ_INT64_FMT "I64" +#define PJ_UNREACHED(x) #endif /* __PJ_COMPAT_CC_MSVC_H__ */ + diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_mwcc.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_mwcc.h similarity index 94% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_mwcc.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_mwcc.h index 33319951f78dd864bdb5fb4a1f10616b2dceec5b..a770110d09aaa143ed51b4fab2d6d432525989b7 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/cc_mwcc.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/cc_mwcc.h @@ -1,4 +1,4 @@ -/* $Id: cc_mwcc.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: cc_mwcc.h 2407 2009-01-01 20:56:36Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -49,6 +49,7 @@ typedef unsigned long long pj_uint64_t; #define PJ_UINT64(val) val##LLU #define PJ_INT64_FMT "L" +#define PJ_UNREACHED(x) #endif /* __PJ_COMPAT_CC_MWCC_H__ */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/ctype.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/ctype.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/ctype.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/ctype.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/errno.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/errno.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/high_precision.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/high_precision.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/high_precision.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/high_precision.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_alpha.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_alpha.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_alpha.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_alpha.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_armv4.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_armv4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_armv4.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_armv4.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h similarity index 77% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h index 56a9d63a9cd75f59dedf60012f92f91f0ef79b7c..bbdce3ca67bafb8bef5e8186d18d37259be66260 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h @@ -1,5 +1,5 @@ /* pjlib/include/pj/compat/m_auto.h. Generated by configure. */ -/* $Id: m_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: m_auto.h.in 2528 2009-03-23 12:09:19Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -29,8 +29,18 @@ /* Machine name, filled in by autoconf script */ #define PJ_M_NAME "x86_64" -/* Endianness, as detected by autoconf */ -/* #undef WORDS_BIGENDIAN */ +/* Endianness. It's reported on pjsip list on 09/02/13 that autoconf + * endianness detection failed for universal build, so special case + * for it here. Thanks Ruud Klaver for the fix. + */ +#ifdef PJ_DARWINOS +# ifdef __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else + /* Endianness, as detected by autoconf */ +/* # undef WORDS_BIGENDIAN */ +#endif #ifdef WORDS_BIGENDIAN # define PJ_IS_LITTLE_ENDIAN 0 @@ -48,3 +58,4 @@ #define PJ_HAS_PENTIUM 0 #endif /* __PJ_COMPAT_M_AUTO_H__ */ + diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h.in b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h.in similarity index 76% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h.in rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h.in index dac97d0ce683c8a401a3f4c08ff753ce447d1489..236769ea5e9841797be0d4c30c65a6a5c10d64d1 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_auto.h.in +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_auto.h.in @@ -1,4 +1,4 @@ -/* $Id: m_auto.h.in 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: m_auto.h.in 2528 2009-03-23 12:09:19Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -28,8 +28,18 @@ /* Machine name, filled in by autoconf script */ #undef PJ_M_NAME -/* Endianness, as detected by autoconf */ -#undef WORDS_BIGENDIAN +/* Endianness. It's reported on pjsip list on 09/02/13 that autoconf + * endianness detection failed for universal build, so special case + * for it here. Thanks Ruud Klaver for the fix. + */ +#ifdef PJ_DARWINOS +# ifdef __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else + /* Endianness, as detected by autoconf */ +# undef WORDS_BIGENDIAN +#endif #ifdef WORDS_BIGENDIAN # define PJ_IS_LITTLE_ENDIAN 0 @@ -47,3 +57,4 @@ #define PJ_HAS_PENTIUM 0 #endif /* __PJ_COMPAT_M_AUTO_H__ */ + diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_i386.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_i386.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_i386.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_i386.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_m68k.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_m68k.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_m68k.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_m68k.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_powerpc.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_powerpc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_powerpc.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_powerpc.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_sparc.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_sparc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_sparc.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_sparc.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_x86_64.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_x86_64.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/m_x86_64.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/m_x86_64.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/malloc.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/malloc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/malloc.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/malloc.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h.in b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_auto.h.in rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_auto.h.in diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_darwinos.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_darwinos.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_darwinos.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_darwinos.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_linux.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_linux.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_linux_kernel.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux_kernel.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_linux_kernel.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_linux_kernel.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_palmos.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_palmos.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_palmos.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_palmos.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_rtems.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_rtems.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_rtems.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_rtems.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_sunos.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_sunos.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_sunos.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_sunos.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_symbian.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_symbian.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_symbian.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_symbian.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_win32.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_win32.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_win32_wince.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32_wince.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/os_win32_wince.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/os_win32_wince.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/rand.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/rand.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/rand.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/rand.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/setjmp.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/setjmp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/setjmp.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/setjmp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/size_t.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/size_t.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/size_t.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/size_t.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/socket.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/socket.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/socket.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/socket.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/stdarg.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdarg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/stdarg.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdarg.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/stdfileio.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdfileio.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/stdfileio.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/stdfileio.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/string.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/string.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/string.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/string.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/time.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/time.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/compat/time.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/compat/time.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/config.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config.h similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/config.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config.h index d28c31e989d085db464ca42b3ff2bb651fb4af9e..2d0e1639273af5ca9966ee2f72c88a935b89d399 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/config.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config.h @@ -1,4 +1,4 @@ -/* $Id: config.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: config.h 2527 2009-03-23 11:57:55Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -108,7 +108,8 @@ # define PJ_SUNOS 1 # include <pj/compat/os_sunos.h> -#elif defined(PJ_DARWINOS) || defined(__MACOSX__) +#elif defined(PJ_DARWINOS) || defined(__MACOSX__) || \ + defined (__APPLE__) || defined (__MACH__) /* * MacOS X */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/config_site.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/config_site.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/config_site_sample.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site_sample.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/config_site_sample.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/config_site_sample.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/ctype.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ctype.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/ctype.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ctype.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/doxygen.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/doxygen.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/doxygen.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/doxygen.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/errno.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/errno.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/except.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/except.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/except.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/except.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/fifobuf.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/fifobuf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/fifobuf.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/fifobuf.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/file_access.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_access.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/file_access.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_access.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/file_io.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_io.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/file_io.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/file_io.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/guid.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/guid.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/guid.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/guid.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/hash.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/hash.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/hash.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/hash.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/ioqueue.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ioqueue.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/ioqueue.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ioqueue.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/ip_helper.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ip_helper.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/ip_helper.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/ip_helper.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/list.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/list.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/list_i.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list_i.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/list_i.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/list_i.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/lock.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/lock.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/lock.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/lock.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/log.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/log.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/log.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/log.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/math.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/math.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/math.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/math.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/os.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/os.h similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/os.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/os.h index 19c0ad4ba3f916a6f1155a76522b7c6f8c20bb4a..9e221e8ee0959a1aa16b93a7f14431e706167505 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/os.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/os.h @@ -1,4 +1,4 @@ -/* $Id: os.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: os.h 2482 2009-03-02 15:50:12Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -394,6 +394,18 @@ typedef struct pj_symbianos_params */ PJ_DECL(pj_status_t) pj_symbianos_set_params(pj_symbianos_params *prm); +/** + * Notify PJLIB that the access point connection has been down or unusable + * and PJLIB should not try to access the Symbian socket API (especially ones + * that send packets). Sending packet when RConnection is reconnected to + * different access point may cause the WaitForRequest() for the function to + * block indefinitely. + * + * @param up If set to PJ_FALSE it will cause PJLIB to not try + * to access socket API, and error will be returned + * immediately instead. + */ +PJ_DECL(void) pj_symbianos_set_connection_status(pj_bool_t up); /** * @} diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/pool.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/pool.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/pool_alt.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_alt.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/pool_alt.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_alt.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/pool_buf.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_buf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/pool_buf.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_buf.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/pool_i.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_i.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/pool_i.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/pool_i.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/rand.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rand.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/rand.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rand.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/rbtree.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rbtree.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/rbtree.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/rbtree.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/sock.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/sock.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/sock_select.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock_select.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/sock_select.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/sock_select.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/string.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/string.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/string_i.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string_i.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/string_i.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/string_i.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/timer.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/timer.h similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/timer.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/timer.h index a6f099cf07bf7ca9997e0df765daf444d9c24c11..55e26269d2a81fa6daead964ef1a7a5a522c7d6c 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/timer.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/timer.h @@ -1,4 +1,4 @@ -/* $Id: timer.h 1405 2007-07-20 08:08:30Z bennylp $ */ +/* $Id: timer.h 2527 2009-03-23 11:57:55Z bennylp $ */ /* * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -258,8 +258,8 @@ PJ_DECL(pj_status_t) pj_timer_heap_earliest_time( pj_timer_heap_t *ht, * * @param ht The timer heap. * @param next_delay If this parameter is not NULL, it will be filled up with - * the time delay until the next timer elapsed, or -1 in - * the sec part if no entry exist. + * the time delay until the next timer elapsed, or + * PJ_MAXINT32 in the sec part if no entry exist. * * @return The number of timers expired. */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/types.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/types.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/unicode.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/unicode.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pj/unicode.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pj/unicode.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pjlib++.hpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib++.hpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pjlib++.hpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib++.hpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/include/pjlib.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/include/pjlib.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/include/pjlib.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/activesock.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/activesock.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/activesock.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/activesock.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_sock.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_sock.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_sock.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_sock.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_symbian.cpp similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_symbian.cpp index e2b10ee541e7d03213e2925d9f368136099fa6ce..8c96d462795c078af8a4be8192c851dda1383afc 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/addr_resolv_symbian.cpp +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/addr_resolv_symbian.cpp @@ -1,4 +1,4 @@ -/* $Id: addr_resolv_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: addr_resolv_symbian.cpp 2482 2009-03-02 15:50:12Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -71,6 +71,9 @@ static pj_status_t getaddrinfo_by_af(int af, const pj_str_t *name, PJ_ASSERT_RETURN(name && count && ai, PJ_EINVAL); + // Return failure if access point is marked as down by app. + PJ_SYMBIAN_CHECK_CONNECTION(); + // Get resolver for the specified address family RHostResolver &resv = PjSymbianOS::Instance()->GetResolver(af); diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/array.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/array.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/array.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/array.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/compat/longjmp_i386.S b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/longjmp_i386.S similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/compat/longjmp_i386.S rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/longjmp_i386.S diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/compat/setjmp_i386.S b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/setjmp_i386.S similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/compat/setjmp_i386.S rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/setjmp_i386.S diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/compat/sigjmp.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/sigjmp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/compat/sigjmp.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/sigjmp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/compat/string.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/compat/string.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/compat/string_compat.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string_compat.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/compat/string_compat.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/compat/string_compat.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/config.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/config.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/config.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/config.c index 27c1e13253e61bda3d13d7b1bde1289903e835d0..f2beb56635399cfc789ea6a03ca35137c457c5b7 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/config.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/config.c @@ -1,4 +1,4 @@ -/* $Id: config.c 2396 2008-12-24 10:04:24Z bennylp $ */ +/* $Id: config.c 2551 2009-03-25 12:13:09Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -22,7 +22,7 @@ #include <pj/ioqueue.h> static const char *id = "config.c"; -PJ_DEF_DATA(const char*) PJ_VERSION = "1.0.1"; +PJ_DEF_DATA(const char*) PJ_VERSION = "1.0.2"; /* * Get PJLIB version string. diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ctype.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ctype.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ctype.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ctype.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/errno.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/errno.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/except.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/except.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/except.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/except.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/exception_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/exception_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/exception_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/exception_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/extra-exports.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/extra-exports.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/extra-exports.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/extra-exports.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/fifobuf.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/fifobuf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/fifobuf.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/fifobuf.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/file_access_unistd.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_unistd.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/file_access_unistd.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_unistd.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/file_access_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/file_access_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_access_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/file_io_ansi.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_ansi.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/file_io_ansi.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_ansi.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/file_io_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/file_io_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/file_io_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/guid.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/guid.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/guid_simple.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_simple.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/guid_simple.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_simple.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/guid_uuid.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_uuid.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/guid_uuid.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_uuid.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/guid_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/guid_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/guid_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/hash.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/hash.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/hash.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/hash.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_common_abs.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_common_abs.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_common_abs.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_common_abs.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_common_abs.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_dummy.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_dummy.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_dummy.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_dummy.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_epoll.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_epoll.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_epoll.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_epoll.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_select.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_select.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_select.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_select.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_symbian.cpp similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_symbian.cpp index ec8c1fc5bc47794578acea5ffbf2b9d00b8e4f62..5b77488d926e3aa24cd7dad9c746023f64f03c96 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_symbian.cpp +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_symbian.cpp @@ -1,4 +1,4 @@ -/* $Id: ioqueue_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: ioqueue_symbian.cpp 2482 2009-03-02 15:50:12Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -635,6 +635,9 @@ PJ_DEF(pj_status_t) pj_ioqueue_connect( pj_ioqueue_key_t *key, TInetAddr inetAddr; TRequestStatus reqStatus; + // Return failure if access point is marked as down by app. + PJ_SYMBIAN_CHECK_CONNECTION(); + // Convert address status = PjSymbianOS::pj2Addr(*(const pj_sockaddr*)addr, addrlen, inetAddr); @@ -747,6 +750,9 @@ PJ_DEF(pj_status_t) pj_ioqueue_send( pj_ioqueue_key_t *key, // Forcing pending operation is not supported. PJ_ASSERT_RETURN((flags & PJ_IOQUEUE_ALWAYS_ASYNC)==0, PJ_EINVAL); + // Return failure if access point is marked as down by app. + PJ_SYMBIAN_CHECK_CONNECTION(); + // Clear flag flags &= ~PJ_IOQUEUE_ALWAYS_ASYNC; @@ -785,6 +791,9 @@ PJ_DEF(pj_status_t) pj_ioqueue_sendto( pj_ioqueue_key_t *key, // Forcing pending operation is not supported. PJ_ASSERT_RETURN((flags & PJ_IOQUEUE_ALWAYS_ASYNC)==0, PJ_EINVAL); + // Return failure if access point is marked as down by app. + PJ_SYMBIAN_CHECK_CONNECTION(); + // Convert address status = PjSymbianOS::pj2Addr(*(const pj_sockaddr*)addr, addrlen, inetAddr); diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_winnt.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_winnt.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ioqueue_winnt.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ioqueue_winnt.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_generic.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_generic.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_generic.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_generic.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/ip_helper_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/ip_helper_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/list.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/list.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/list.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/list.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/lock.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/lock.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/lock.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/lock.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/log.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/log.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_printk.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_printk.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_printk.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_printk.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_stdout.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_stdout.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_stdout.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_stdout.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_symbian_console.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_symbian_console.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/log_writer_symbian_console.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/log_writer_symbian_console.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_core_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_core_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_core_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_symbian.cpp similarity index 97% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_core_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_symbian.cpp index f9037498965c761ba4f6e0c564357e55d56c552b..9f2d1e6958cf923d8f0f32718acebf575f6a83a1 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_core_symbian.cpp +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_symbian.cpp @@ -1,4 +1,4 @@ -/* $Id: os_core_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: os_core_symbian.cpp 2482 2009-03-02 15:50:12Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -151,7 +151,8 @@ TInt CPjTimeoutTimer::RunError(TInt aError) // PjSymbianOS::PjSymbianOS() -: isSocketServInitialized_(false), isResolverInitialized_(false), +: isConnectionUp_(false), + isSocketServInitialized_(false), isResolverInitialized_(false), console_(NULL), selectTimeoutTimer_(NULL), appSocketServ_(NULL), appConnection_(NULL), appHostResolver_(NULL), appHostResolver6_(NULL) @@ -229,6 +230,8 @@ TInt PjSymbianOS::Initialize() isResolverInitialized_ = true; } + isConnectionUp_ = true; + return KErrNone; on_error: @@ -239,6 +242,8 @@ on_error: // Shutdown void PjSymbianOS::Shutdown() { + isConnectionUp_ = false; + if (isResolverInitialized_) { hostResolver_.Close(); #if defined(PJ_HAS_IPV6) && PJ_HAS_IPV6!=0 @@ -252,15 +257,16 @@ void PjSymbianOS::Shutdown() isSocketServInitialized_ = false; } - if (console_) { - delete console_; - console_ = NULL; - } + delete console_; + console_ = NULL; - if (selectTimeoutTimer_) { - delete selectTimeoutTimer_; - selectTimeoutTimer_ = NULL; - } + delete selectTimeoutTimer_; + selectTimeoutTimer_ = NULL; + + appSocketServ_ = NULL; + appConnection_ = NULL; + appHostResolver_ = NULL; + appHostResolver6_ = NULL; } // Convert to Unicode @@ -306,6 +312,13 @@ PJ_DEF(pj_status_t) pj_symbianos_set_params(pj_symbianos_params *prm) } +/* Set connection status */ +PJ_DEF(void) pj_symbianos_set_connection_status(pj_bool_t up) +{ + PjSymbianOS::Instance()->SetConnectionStatus(up != 0); +} + + /* * pj_init(void). * Init PJLIB! diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_core_unix.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_unix.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_core_unix.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_unix.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_core_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_core_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_core_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_error_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_error_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_error_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_error_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_error_unix.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_unix.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_error_unix.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_unix.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_error_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_error_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_error_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_rwmutex.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_rwmutex.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_rwmutex.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_rwmutex.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_symbian.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_symbian.h similarity index 91% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_symbian.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_symbian.h index f7f722bbb9b55cbc45e0e3fb82ebf552f8d423e7..9c01516fa7cf9ef09b80e34513e7ab6df90841d3 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_symbian.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_symbian.h @@ -1,4 +1,4 @@ -/* $Id: os_symbian.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: os_symbian.h 2482 2009-03-02 15:50:12Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -313,6 +313,21 @@ public: } } + // + // Return true if the access point connection is up + // + bool IsConnectionUp() const + { + return isConnectionUp_; + } + + // + // Set access point connection status + // + void SetConnectionStatus(bool up) + { + isConnectionUp_ = up; + } // // Unicode Converter @@ -353,6 +368,8 @@ public: } private: + bool isConnectionUp_; + bool isSocketServInitialized_; RSocketServ socketServ_; @@ -374,6 +391,17 @@ private: PjSymbianOS(); }; +// This macro is used to check the access point connection status and return +// failure if the AP connection is down or unusable. See the documentation +// of pj_symbianos_set_connection_status() for more info +#define PJ_SYMBIAN_CHECK_CONNECTION() \ + PJ_SYMBIAN_CHECK_CONNECTION2(PJ_ECANCELLED) + +#define PJ_SYMBIAN_CHECK_CONNECTION2(retval) \ + do { \ + if (!PjSymbianOS::Instance()->IsConnectionUp()) \ + return retval; \ + } while (0); #endif /* __OS_SYMBIAN_H__ */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_time_bsd.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_bsd.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_time_bsd.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_bsd.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_time_common.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_common.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_time_common.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_common.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_time_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_time_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_time_unix.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_unix.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_time_unix.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_unix.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_time_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_time_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_time_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_common.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_common.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_common.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_common.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_posix.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_posix.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_posix.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_posix.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/os_timestamp_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/os_timestamp_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_buf.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_buf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_buf.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_buf.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_caching.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_caching.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_caching.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_caching.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_dbg.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_dbg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_dbg.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_dbg.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_kmalloc.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_kmalloc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_kmalloc.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_kmalloc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_malloc.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_malloc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_malloc.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_malloc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_new.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_new.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_policy_new.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_policy_new.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_signature.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_signature.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/pool_signature.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/pool_signature.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/rand.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rand.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/rand.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rand.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/rbtree.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rbtree.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/rbtree.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/rbtree.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_bsd.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_bsd.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_bsd.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_bsd.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_common.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_common.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_common.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_common.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_select.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_select.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_select_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_select_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_select_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_symbian.cpp similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_symbian.cpp index 8b4765f896ef8441b8b41becdc6109cf1dc75c47..be9a9615bfb54584652b731f458df7a0e5eef830 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/sock_symbian.cpp +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/sock_symbian.cpp @@ -1,4 +1,4 @@ -/* $Id: sock_symbian.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sock_symbian.cpp 2482 2009-03-02 15:50:12Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -463,6 +463,9 @@ PJ_DEF(const pj_str_t*) pj_gethostname(void) TRequestStatus reqStatus; THostName tmpName; + // Return empty hostname if access point is marked as down by app. + PJ_SYMBIAN_CHECK_CONNECTION2(&hostname); + resv.GetHostName(tmpName, reqStatus); User::WaitForRequest(reqStatus); @@ -488,6 +491,9 @@ PJ_DEF(pj_status_t) pj_sock_socket(int af, /* Sanity checks. */ PJ_ASSERT_RETURN(p_sock!=NULL, PJ_EINVAL); + // Return failure if access point is marked as down by app. + PJ_SYMBIAN_CHECK_CONNECTION(); + /* Set proto if none is specified. */ if (proto == 0) { if (type == pj_SOCK_STREAM()) @@ -642,6 +648,9 @@ PJ_DEF(pj_status_t) pj_sock_send(pj_sock_t sock, PJ_CHECK_STACK(); PJ_ASSERT_RETURN(sock && buf && len, PJ_EINVAL); + // Return failure if access point is marked as down by app. + PJ_SYMBIAN_CHECK_CONNECTION(); + CPjSocket *pjSock = (CPjSocket*)sock; RSocket &rSock = pjSock->Socket(); @@ -678,6 +687,9 @@ PJ_DEF(pj_status_t) pj_sock_sendto(pj_sock_t sock, PJ_CHECK_STACK(); PJ_ASSERT_RETURN(sock && buf && len, PJ_EINVAL); + // Return failure if access point is marked as down by app. + PJ_SYMBIAN_CHECK_CONNECTION(); + CPjSocket *pjSock = (CPjSocket*)sock; RSocket &rSock = pjSock->Socket(); @@ -717,6 +729,9 @@ PJ_DEF(pj_status_t) pj_sock_recv(pj_sock_t sock, PJ_ASSERT_RETURN(sock && buf && len, PJ_EINVAL); PJ_ASSERT_RETURN(*len > 0, PJ_EINVAL); + // Return failure if access point is marked as down by app. + PJ_SYMBIAN_CHECK_CONNECTION(); + CPjSocket *pjSock = (CPjSocket*)sock; RSocket &rSock = pjSock->Socket(); @@ -771,6 +786,9 @@ PJ_DEF(pj_status_t) pj_sock_recvfrom(pj_sock_t sock, PJ_ASSERT_RETURN(*len > 0, PJ_EINVAL); PJ_ASSERT_RETURN(*fromlen >= (int)sizeof(pj_sockaddr_in), PJ_EINVAL); + // Return failure if access point is marked as down by app. + PJ_SYMBIAN_CHECK_CONNECTION(); + CPjSocket *pjSock = (CPjSocket*)sock; RSocket &rSock = pjSock->Socket(); @@ -868,6 +886,9 @@ PJ_DEF(pj_status_t) pj_sock_connect( pj_sock_t sock, PJ_ASSERT_RETURN(((pj_sockaddr*)addr)->addr.sa_family == PJ_AF_INET, PJ_EINVAL); + // Return failure if access point is marked as down by app. + PJ_SYMBIAN_CHECK_CONNECTION(); + CPjSocket *pjSock = (CPjSocket*)sock; RSocket &rSock = pjSock->Socket(); diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/string.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/string.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/string.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/string.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/symbols.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/symbols.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/symbols.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/symbols.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/timer.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/timer.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/timer_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/timer_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/timer_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/types.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/types.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/types.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/types.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/unicode_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/unicode_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/unicode_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pj/unicode_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pj/unicode_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib++-test/main.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib++-test/main.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib++-test/main.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib++-test/main.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/except.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/except.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/except.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/except.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/list.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/list.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/list.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/list.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/log.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/log.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-samples/log.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-samples/log.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/activesock.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/activesock.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/activesock.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/activesock.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/atomic.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/atomic.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/atomic.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/atomic.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/echo_clt.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/echo_clt.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/echo_clt.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/echo_clt.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/errno.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/errno.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/exception.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/exception.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/exception.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/exception.c index dfbc638cfc363bd4b4aa88b83289e7dd69255911..1bcd95549b4e8ee1112357fbe493fcc4b0fdbab8 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/exception.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/exception.c @@ -1,4 +1,4 @@ -/* $Id: exception.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: exception.c 2407 2009-01-01 20:56:36Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -54,13 +54,13 @@ static int throw_id_1(void) { PJ_THROW( ID_1 ); - return -1; + PJ_UNREACHED(return -1;) } static int throw_id_2(void) { PJ_THROW( ID_2 ); - return -1; + PJ_UNREACHED(return -1;) } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/fifobuf.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/fifobuf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/fifobuf.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/fifobuf.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/file.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/file.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/file.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/file.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/hash_test.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/hash_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/hash_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/hash_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_perf.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_perf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_perf.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_perf.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_tcp.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_tcp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_tcp.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_tcp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_udp.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_udp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_udp.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_udp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_unreg.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_unreg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/ioq_unreg.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/ioq_unreg.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/list.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/list.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/list.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/list.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main.c index ae175407c70ae9646bf17212ce2567167866a4af..d7adce484af17a9c523b2ed6591a14dc0656e8ae 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: main.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -98,7 +98,8 @@ int main(int argc, char *argv[]) char s[10]; puts(""); puts("Press <ENTER> to exit"); - fgets(s, sizeof(s), stdin); + if (!fgets(s, sizeof(s), stdin)) + return rc; } return rc; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_mod.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_mod.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_mod.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_mod.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_rtems.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_rtems.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_rtems.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_rtems.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/main_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/main_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/mutex.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/mutex.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/mutex.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/mutex.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/os.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/os.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/os.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/os.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/pool.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/pool.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/pool_perf.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool_perf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/pool_perf.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/pool_perf.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rand.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rand.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rand.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rand.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rbtree.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rbtree.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rbtree.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rbtree.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rtems_network_config.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rtems_network_config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/rtems_network_config.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/rtems_network_config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/select.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/select.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/select.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/select.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sleep.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sleep.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sleep.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sleep.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sock.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sock.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sock_perf.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock_perf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/sock_perf.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/sock_perf.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/string.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/string.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/string.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/string.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/test.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/test.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/test.h b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/test.h rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/test.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/thread.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/thread.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/thread.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/thread.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/timer.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/timer.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timer.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/timestamp.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timestamp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/timestamp.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/timestamp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c index f23350e3a24cb525215b98e6dcf25d77dc6887e9..8646985413bf754b69211e28308adc516b3d07a9 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_ioqueue.c @@ -150,7 +150,7 @@ static int worker_thread(void *arg) timeout.sec = 0; timeout.msec = 10; rc = pj_ioqueue_poll(ioqueue, &timeout); } - return 0; + PJ_UNREACHED(return 0;) } int udp_echo_srv_ioqueue(void) diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_sync.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_sync.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_sync.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_sync.c index 5930c9faa1d38e8f6e42c65304afc83ed0ee2668..29f8d90ea40bd7a73592daf0932ae8fd374024a9 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/udp_echo_srv_sync.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/udp_echo_srv_sync.c @@ -1,4 +1,4 @@ -/* $Id: udp_echo_srv_sync.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: udp_echo_srv_sync.c 2407 2009-01-01 20:56:36Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -56,7 +56,7 @@ static int worker_thread(void *arg) continue; } } - return 0; + PJ_UNREACHED(return 0;) } @@ -160,7 +160,7 @@ int echo_srv_common_loop(pj_atomic_t *bytes_counter) (unsigned)(highest_bw/1000))); } } - return 0; + PJ_UNREACHED(return 0;) } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/util.c b/sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/util.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjlib/src/pjlib-test/util.c rename to sflphone-common/libs/pjproject-1.0.2/pjlib/src/pjlib-test/util.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/README.txt b/sflphone-common/libs/pjproject-1.0.2/pjmedia/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/README.txt rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu new file mode 100755 index 0000000000000000000000000000000000000000..e79b87acc0657fe03f984fa890304b3d4ef82de7 Binary files /dev/null and b/sflphone-common/libs/pjproject-1.0.2/pjmedia/bin/pjmedia-test-x86_64-unknown-linux-gnu differ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/Jbtest.dat b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Jbtest.dat similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/Jbtest.dat rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Jbtest.dat diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/Makefile b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/Makefile rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/m-i386.mak b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-i386.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/m-i386.mak rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-i386.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/m-x86_64.mak b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-x86_64.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/m-x86_64.mak rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/m-x86_64.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-auto.mak rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-darwinos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-darwinos.mak rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-darwinos.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-linux.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-linux.mak rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-linux.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-rtems.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-rtems.mak rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-rtems.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/os-win32.mak rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/os-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjaut.dsp b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjaut.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjaut.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjaut.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia.dsp b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia.dsw b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia.dsw rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.dsw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia_codec.dsp b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia_codec.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia_codec.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia_codec.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_codec.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia_test.dsp b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia_test.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia_test.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.vcproj similarity index 94% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia_test.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.vcproj index 786bb466c76f4fb5a1b75fe111d25d3d768c122c..939b4cc6f132078511a31281141b887f6762c5ea 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/pjmedia_test.vcproj +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/pjmedia_test.vcproj @@ -71,7 +71,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib" - OutputFile="../bin/pjmedia_test_vc8d.exe" + OutputFile="../bin/pjmedia-test-i386-win32-vc8-debug.exe" LinkIncremental="2" SuppressStartupBanner="true" GenerateDebugInformation="true" @@ -164,7 +164,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib user32.lib" - OutputFile="../bin/pjmedia_test_vc8.exe" + OutputFile="../bin/pjmedia-test-i386-win32-vc8-release.exe" LinkIncremental="1" SuppressStartupBanner="true" ProgramDatabaseFile=".\output\pjmedia_test_vc6_Release/pjmedia_test_vc6.pdb" diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_codec_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_test.vcp b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_test.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_test.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_test.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_wince.vcw b/sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/build/wince-evc4/pjmedia_wince.vcw rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/build/wince-evc4/pjmedia_wince.vcw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/doxygen.cfg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/doxygen.cfg rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/doxygen.cfg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/footer.html b/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/footer.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/footer.html rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/footer.html diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/header.html b/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/header.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/header.html rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/header.html diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/master-port.jpg b/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/master-port.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/master-port.jpg rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/master-port.jpg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/media-flow.jpg b/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/media-flow.jpg rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.jpg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/media-flow.vsd b/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.vsd similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/media-flow.vsd rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-flow.vsd diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/media-srtp-transport.PNG b/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-srtp-transport.PNG similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/media-srtp-transport.PNG rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-srtp-transport.PNG diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/media-transport.PNG b/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-transport.PNG similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/media-transport.PNG rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/media-transport.PNG diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/sample-manual-resampling.jpg b/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sample-manual-resampling.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/sample-manual-resampling.jpg rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sample-manual-resampling.jpg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/siprtp.jpg b/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/siprtp.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/siprtp.jpg rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/siprtp.jpg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/sndtest.jpg b/sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sndtest.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/docs/sndtest.jpg rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/docs/sndtest.jpg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/amr_helper.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/amr_helper.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/amr_helper.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/amr_helper.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h.in b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/config_auto.h.in rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/config_auto.h.in diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/g722.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/g722.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/g722.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/g722.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/gsm.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/gsm.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/gsm.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/gsm.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/ilbc.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ilbc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/ilbc.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ilbc.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/ipp_codecs.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ipp_codecs.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/ipp_codecs.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/ipp_codecs.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/l16.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/l16.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/l16.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/l16.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/speex.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/speex.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/speex.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/speex.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/types.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia-codec/types.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia-codec/types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/alaw_ulaw.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/alaw_ulaw.h similarity index 68% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/alaw_ulaw.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/alaw_ulaw.h index 94483c9ee28e78ebb324bf2fd8d633cab4188e58..530882e31b12026d15964b930b87888b1fb62092 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/alaw_ulaw.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/alaw_ulaw.h @@ -1,4 +1,4 @@ -/* $Id: alaw_ulaw.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: alaw_ulaw.h 2416 2009-01-05 15:27:02Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -139,6 +139,74 @@ PJ_DECL(unsigned char) pjmedia_ulaw2alaw(unsigned char uval); #endif +/** + * Encode 16-bit linear PCM data to 8-bit U-Law data. + * + * @param dst Destination buffer for 8-bit U-Law data. + * @param src Source, 16-bit linear PCM data. + * @param len Number of samples. + */ +PJ_INLINE(void) pjmedia_ulaw_encode(pj_uint8_t *dst, const pj_int16_t *src, + pj_size_t len) +{ + const pj_int16_t *end = src + len; + + while (src < end) { + *dst++ = pjmedia_linear2ulaw(*src++); + } +} + +/** + * Encode 16-bit linear PCM data to 8-bit A-Law data. + * + * @param dst Destination buffer for 8-bit A-Law data. + * @param src Source, 16-bit linear PCM data. + * @param len Number of samples. + */ +PJ_INLINE(void) pjmedia_alaw_encode(pj_uint8_t *dst, const pj_int16_t *src, + pj_size_t len) +{ + const pj_int16_t *end = src + len; + + while (src < end) { + *dst++ = pjmedia_linear2alaw(*src++); + } +} + +/** + * Decode 8-bit U-Law data to 16-bit linear PCM data. + * + * @param dst Destination buffer for 16-bit PCM data. + * @param src Source, 8-bit U-Law data. + * @param len Number of samples. + */ +PJ_INLINE(void) pjmedia_ulaw_decode(pj_int16_t *dst, const pj_uint8_t *src, + pj_size_t len) +{ + const pj_uint8_t *end = src + len; + + while (src < end) { + *dst++ = pjmedia_ulaw2linear(*src++); + } +} + +/** + * Decode 8-bit A-Law data to 16-bit linear PCM data. + * + * @param dst Destination buffer for 16-bit PCM data. + * @param src Source, 8-bit A-Law data. + * @param len Number of samples. + */ +PJ_INLINE(void) pjmedia_alaw_decode(pj_int16_t *dst, const pj_uint8_t *src, + pj_size_t len) +{ + const pj_uint8_t *end = src + len; + + while (src < end) { + *dst++ = pjmedia_alaw2linear(*src++); + } +} + PJ_END_DECL #endif /* __PJMEDIA_ALAW_ULAW_H__ */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/bidirectional.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/bidirectional.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/bidirectional.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/bidirectional.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/circbuf.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/circbuf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/circbuf.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/circbuf.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/clock.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/clock.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/clock.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/clock.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/codec.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/codec.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/codec.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/codec.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/conference.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/conference.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/conference.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/conference.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h.in b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/config_auto.h.in rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/config_auto.h.in diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/delaybuf.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/delaybuf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/delaybuf.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/delaybuf.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/doxygen.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/doxygen.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/doxygen.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/doxygen.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/echo.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/echo.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/echo_port.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/echo_port.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/echo_port.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/endpoint.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/endpoint.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/endpoint.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/endpoint.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/errno.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/errno.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/g711.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/g711.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/g711.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/g711.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/jbuf.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/jbuf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/jbuf.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/jbuf.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/master_port.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/master_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/master_port.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/master_port.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/mem_port.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/mem_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/mem_port.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/mem_port.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/null_port.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/null_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/null_port.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/null_port.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/plc.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/plc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/plc.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/plc.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/port.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/port.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/port.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/resample.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/resample.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/resample.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/resample.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtcp.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtcp.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtcp_xr.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp_xr.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtcp_xr.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtcp_xr.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtp.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/rtp.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/rtp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sdp.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sdp.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sdp_neg.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp_neg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sdp_neg.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sdp_neg.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/session.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/session.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/session.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/session.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/silencedet.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/silencedet.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/silencedet.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/silencedet.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sound.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sound.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sound_port.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/sound_port.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/sound_port.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/splitcomb.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/splitcomb.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/splitcomb.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/splitcomb.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/stereo.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stereo.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/stereo.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stereo.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/stream.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stream.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/stream.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/stream.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/symbian_sound_aps.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/symbian_sound_aps.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/symbian_sound_aps.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/symbian_sound_aps.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/tonegen.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/tonegen.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/tonegen.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/tonegen.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_adapter_sample.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_adapter_sample.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_adapter_sample.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_adapter_sample.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_ice.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_ice.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_ice.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_ice.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_loop.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_loop.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_loop.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_loop.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_srtp.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_srtp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_srtp.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_srtp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_udp.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_udp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/transport_udp.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/transport_udp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/types.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/types.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wav_playlist.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_playlist.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wav_playlist.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_playlist.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wav_port.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wav_port.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wav_port.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wave.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wave.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wave.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wave.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wsola.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wsola.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/include/pjmedia/wsola.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/include/pjmedia/wsola.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_dec.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_dec.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_dec.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_dec.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_dec.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_enc.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_enc.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_enc.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/g722/g722_enc.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/g722/g722_enc.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/gsm.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/gsm.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/gsm.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/gsm.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/ilbc.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ilbc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/ilbc.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ilbc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/ipp_codecs.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ipp_codecs.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/ipp_codecs.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ipp_codecs.c index a897158aeaedcd81541b9c2d8c2b3051357b67b0..2ae0654012e2ddde699b89fd0ff1553055fd062b 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/ipp_codecs.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/ipp_codecs.c @@ -1,4 +1,4 @@ -/* $Id: ipp_codecs.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: ipp_codecs.c 2543 2009-03-23 13:22:45Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -37,6 +37,7 @@ #if defined(PJMEDIA_HAS_INTEL_IPP) && PJMEDIA_HAS_INTEL_IPP != 0 #include <usc.h> +#include <ippversion.h> #define THIS_FILE "ipp_codecs.c" @@ -1046,12 +1047,12 @@ static pj_status_t ipp_codec_open( pjmedia_codec *codec, if (s->enc_mode < 0) goto on_error; - s->enc_setting.amr_nb = ippc->pt == PJMEDIA_RTP_PT_AMR; + s->enc_setting.amr_nb = (pj_uint8_t)(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.amr_nb = (pj_uint8_t)(ippc->pt == PJMEDIA_RTP_PT_AMR); s->dec_setting.octet_aligned = octet_align; s->dec_setting.reorder = PJ_TRUE; } @@ -1412,7 +1413,18 @@ static pj_status_t ipp_codec_recover(pjmedia_codec *codec, # pragma comment( lib, "ipps.lib") # pragma comment( lib, "ippsc.lib") # pragma comment( lib, "ippsr.lib") -# pragma comment( lib, "usc.lib") +//# pragma comment( lib, "ippcorel.lib") +//# pragma comment( lib, "ippsemerged.lib") +//# pragma comment( lib, "ippsmerged.lib") +//# pragma comment( lib, "ippscemerged.lib") +//# pragma comment( lib, "ippscmerged.lib") +//# pragma comment( lib, "ippsremerged.lib") +//# pragma comment( lib, "ippsrmerged.lib") +# if defined(IPP_VERSION_MAJOR) && IPP_VERSION_MAJOR>=6 +# pragma comment( lib, "speech.lib") +# else +# pragma comment( lib, "usc.lib") +# endif #endif diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/l16.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/l16.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/l16.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/l16.c index 2f69f3e3f45054b7020cda2e86ccaf5be8914c78..c4aee2ab9d436298f05751156da0579ab1199a6d 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/l16.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/l16.c @@ -1,4 +1,4 @@ -/* $Id: l16.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: l16.c 2547 2009-03-23 13:27:54Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -98,7 +98,11 @@ static pjmedia_codec_op l16_op = &l16_parse, &l16_encode, &l16_decode, +#if !PLC_DISABLED &l16_recover +#else + NULL +#endif }; /* Definition for L16 codec factory operations. */ @@ -128,8 +132,8 @@ struct l16_data unsigned frame_size; /* Frame size, in bytes */ unsigned clock_rate; /* Clock rate */ - pj_bool_t plc_enabled; #if !PLC_DISABLED + pj_bool_t plc_enabled; pjmedia_plc *plc; #endif pj_bool_t vad_enabled; @@ -421,7 +425,7 @@ static pj_status_t l16_enum_codecs( pjmedia_codec_factory *factory, if (count < *max_count) { /* 48KHz stereo */ codecs[count].type = PJMEDIA_TYPE_AUDIO; - codecs[count].pt = PJMEDIA_RTP_PT_L16_48KHZ_MONO; + codecs[count].pt = PJMEDIA_RTP_PT_L16_48KHZ_STEREO; codecs[count].encoding_name = STR_L16; codecs[count].clock_rate = 48000; codecs[count].channel_cnt = 2; @@ -526,9 +530,17 @@ static pj_status_t l16_init( pjmedia_codec *codec, pj_pool_t *pool ) static pj_status_t l16_open(pjmedia_codec *codec, pjmedia_codec_param *attr ) { - /* Nothing to do.. */ - PJ_UNUSED_ARG(codec); - PJ_UNUSED_ARG(attr); + struct l16_data *data = NULL; + + PJ_ASSERT_RETURN(codec && codec->codec_data && attr, PJ_EINVAL); + + data = (struct l16_data*) codec->codec_data; + + data->vad_enabled = (attr->setting.vad != 0); +#if !PLC_DISABLED + data->plc_enabled = (attr->setting.plc != 0); +#endif + return PJ_SUCCESS; } @@ -547,7 +559,9 @@ static pj_status_t l16_modify(pjmedia_codec *codec, pj_assert(data != NULL); data->vad_enabled = (attr->setting.vad != 0); +#if !PLC_DISABLED data->plc_enabled = (attr->setting.plc != 0); +#endif return PJ_SUCCESS; } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/speex_codec.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/speex_codec.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia-codec/speex_codec.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia-codec/speex_codec.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/alaw_ulaw.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/alaw_ulaw.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/alaw_ulaw_table.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/alaw_ulaw_table.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/alaw_ulaw_table.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/bidirectional.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/bidirectional.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/bidirectional.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/bidirectional.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/clock_thread.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/clock_thread.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/clock_thread.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/clock_thread.c index 94c24274bfcffd2f61697fe9cc6aa7df9ef86c17..f1cd1518673b720b89a53b741cc84ffd1fdde0e7 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/clock_thread.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/clock_thread.c @@ -1,4 +1,4 @@ -/* $Id: clock_thread.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: clock_thread.c 2550 2009-03-23 13:32:39Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -35,7 +35,7 @@ struct pjmedia_clock pj_timestamp interval; pj_timestamp next_tick; pj_timestamp timestamp; - unsigned samples_per_frame; + unsigned timestamp_inc; unsigned options; pj_uint64_t max_jump; pjmedia_clock_callback *cb; @@ -81,7 +81,7 @@ PJ_DEF(pj_status_t) pjmedia_clock_create( pj_pool_t *pool, clock->next_tick.u64 = 0; clock->timestamp.u64 = 0; clock->max_jump = MAX_JUMP_MSEC * clock->freq.u64 / 1000; - clock->samples_per_frame = samples_per_frame; + clock->timestamp_inc = samples_per_frame / channel_count; clock->options = options; clock->cb = cb; clock->user_data = user_data; @@ -200,7 +200,7 @@ PJ_DEF(pj_bool_t) pjmedia_clock_wait( pjmedia_clock *clock, ts->u64 = clock->timestamp.u64; /* Increment timestamp */ - clock->timestamp.u64 += clock->samples_per_frame; + clock->timestamp.u64 += clock->timestamp_inc; /* Calculate next tick */ clock_calc_next_tick(clock, &now); @@ -255,7 +255,7 @@ static int clock_thread(void *arg) (*clock->cb)(&clock->timestamp, clock->user_data); /* Increment timestamp */ - clock->timestamp.u64 += clock->samples_per_frame; + clock->timestamp.u64 += clock->timestamp_inc; /* Calculate next tick */ clock_calc_next_tick(clock, &now); diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/codec.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/codec.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/codec.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/codec.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/conference.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/conference.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/conference.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/conference.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/delaybuf.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/delaybuf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/delaybuf.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/delaybuf.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/dsound.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/dsound.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/dsound.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/dsound.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_common.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_common.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_common.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_common.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_internal.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_internal.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_internal.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_internal.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_port.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_port.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_port.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_speex.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_speex.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_speex.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_speex.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_suppress.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_suppress.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/echo_suppress.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/echo_suppress.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/endpoint.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/endpoint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/endpoint.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/endpoint.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/errno.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/errno.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/g711.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/g711.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/g711.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/g711.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/jbuf.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/jbuf.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/jbuf.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/jbuf.c index ba8c4e6238b152fb958cf63cb24d66ef79656573..75c3e11e7dbc5fbed8168be1bb25488dea727ffd 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/jbuf.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/jbuf.c @@ -1,4 +1,4 @@ -/* $Id: jbuf.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: jbuf.c 2549 2009-03-23 13:30:26Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -267,6 +267,13 @@ static pj_bool_t jb_framelist_put_at(jb_framelist_t *framelist, framelist->flist_max_count; } } else { + // check if frame is not too late, but watch out for sequence restart. + if (index < framelist->flist_origin && + framelist->flist_origin - index < 0x7FFF) + { + return PJ_FALSE; + } + where = framelist->flist_tail; framelist->flist_origin = index; framelist->flist_tail = (framelist->flist_tail + 1) % diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/master_port.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/master_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/master_port.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/master_port.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/mem_capture.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_capture.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/mem_capture.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_capture.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/mem_player.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_player.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/mem_player.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/mem_player.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/null_port.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/null_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/null_port.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/null_port.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/nullsound.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/nullsound.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/nullsound.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/nullsound.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/pasound.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/pasound.c similarity index 95% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/pasound.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/pasound.c index 000862424bcffadd7085feb204d2dfb477faf618..368be5058c96ba2e4813f7a0158ac4ff2ede515b 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/pasound.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/pasound.c @@ -1,4 +1,4 @@ -/* $Id: pasound.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: pasound.c 2535 2009-03-23 13:10:44Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -72,12 +72,12 @@ struct pjmedia_snd_stream pj_bool_t quit_flag; pj_bool_t rec_thread_exited; - //pj_bool_t rec_thread_initialized; + pj_bool_t rec_thread_initialized; pj_thread_desc rec_thread_desc; pj_thread_t *rec_thread; pj_bool_t play_thread_exited; - //pj_bool_t play_thread_initialized; + pj_bool_t play_thread_initialized; pj_thread_desc play_thread_desc; pj_thread_t *play_thread; @@ -118,13 +118,18 @@ static int PaRecorderCallback(const void *input, if (input == NULL) return paContinue; - // Sometime the thread, where this callback called from, is changed - // (e.g: in MacOS this happens when plugging/unplugging headphone) - // if (stream->rec_thread_initialized == 0) { - if (!pj_thread_is_registered()) { + /* Known cases of callback's thread: + * - The thread may be changed in the middle of a session, e.g: in MacOS + * it happens when plugging/unplugging headphone. + * - The same thread may be reused in consecutive sessions. The first + * session will leave TLS set, but release the TLS data address, + * so the second session must re-register the callback's thread. + */ + if (stream->rec_thread_initialized == 0 || !pj_thread_is_registered()) + { status = pj_thread_register("pa_rec", stream->rec_thread_desc, &stream->rec_thread); - //stream->rec_thread_initialized = 1; + stream->rec_thread_initialized = 1; PJ_LOG(5,(THIS_FILE, "Recorder thread started")); } @@ -214,13 +219,18 @@ static int PaPlayerCallback( const void *input, if (output == NULL) return paContinue; - // Sometime the thread, where this callback called from, is changed - // (e.g: in MacOS this happens when plugging/unplugging headphone) - // if (stream->play_thread_initialized == 0) { - if (!pj_thread_is_registered()) { + /* Known cases of callback's thread: + * - The thread may be changed in the middle of a session, e.g: in MacOS + * it happens when plugging/unplugging headphone. + * - The same thread may be reused in consecutive sessions. The first + * session will leave TLS set, but release the TLS data address, + * so the second session must re-register the callback's thread. + */ + if (stream->play_thread_initialized == 0 || !pj_thread_is_registered()) + { status = pj_thread_register("portaudio", stream->play_thread_desc, &stream->play_thread); - //stream->play_thread_initialized = 1; + stream->play_thread_initialized = 1; PJ_LOG(5,(THIS_FILE, "Player thread started")); } @@ -953,6 +963,9 @@ PJ_DEF(pj_status_t) pjmedia_snd_stream_stop(pjmedia_snd_stream *stream) if (stream->rec_strm && stream->rec_strm != stream->play_strm) err = Pa_StopStream(stream->rec_strm); + stream->play_thread_initialized = 0; + stream->rec_thread_initialized = 0; + PJ_LOG(5,(THIS_FILE, "Done, status=%d", err)); return err ? PJMEDIA_ERRNO_FROM_PORTAUDIO(err) : PJ_SUCCESS; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/plc_common.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/plc_common.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/plc_common.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/plc_common.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/port.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/port.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/port.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_libsamplerate.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_libsamplerate.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_libsamplerate.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_libsamplerate.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_port.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_port.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_port.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_resample.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_resample.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_resample.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_resample.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_speex.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_speex.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/resample_speex.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/resample_speex.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp.c index 9fded1e5ef580f38348a50efd7dafa609242ceef..76ca4d647f11efdf9882788a0fc4706e0394e2e9 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp.c @@ -1,4 +1,4 @@ -/* $Id: rtcp.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: rtcp.c 2529 2009-03-23 12:53:56Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -62,7 +62,7 @@ PJ_DEF(pj_status_t) pjmedia_rtcp_get_ntp_time(const pjmedia_rtcp_session *sess, + sess->tv_base.sec + JAN_1970; /* Calculate seconds fractions */ - ts.u64 %= sess->ts_freq.u64; + ts.u64 = (ts.u64 - sess->ts_base.u64) % sess->ts_freq.u64; pj_assert(ts.u64 < sess->ts_freq.u64); ts.u64 = (ts.u64 << 32) / sess->ts_freq.u64; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp_xr.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp_xr.c similarity index 93% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp_xr.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp_xr.c index 6abd0f6b2632db452f672b5bc3d8e6e7d5dc13e6..e72de376e8186a1a06d9ccb65106315cf72189fb 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtcp_xr.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtcp_xr.c @@ -1,4 +1,4 @@ -/* $Id: rtcp_xr.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: rtcp_xr.c 2545 2009-03-23 13:25:26Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -27,7 +27,7 @@ #include <pj/sock.h> #include <pj/string.h> -#if 1 //defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0) +#if defined(PJMEDIA_HAS_RTCP_XR) && (PJMEDIA_HAS_RTCP_XR != 0) #define THIS_FILE "rtcp_xr.c" @@ -246,7 +246,7 @@ PJ_DEF(void) pjmedia_rtcp_build_rtcp_xr( pjmedia_rtcp_xr_session *sess, pj_uint32_t c31; pj_uint32_t c32; pj_uint32_t c33; - pj_uint32_t ctotal, p32, p23, m; + pj_uint32_t ctotal, m; unsigned est_extra_delay; r = (pjmedia_rtcp_xr_rb_voip_mtc*) &sess->pkt.buf[size]; @@ -257,59 +257,79 @@ PJ_DEF(void) pjmedia_rtcp_build_rtcp_xr( pjmedia_rtcp_xr_session *sess, r->header.specific = 0; r->header.length = pj_htons(8); - /* Calculate additional transition counts. */ + /* Use temp vars for easiness. */ c11 = sess->voip_mtc_stat.c11; c13 = sess->voip_mtc_stat.c13; c14 = sess->voip_mtc_stat.c14; c22 = sess->voip_mtc_stat.c22; c23 = sess->voip_mtc_stat.c23; c33 = sess->voip_mtc_stat.c33; + m = sess->ptime * sess->frames_per_packet; + + /* Calculate additional transition counts. */ c31 = c13; c32 = c23; ctotal = c11 + c14 + c13 + c22 + c23 + c31 + c32 + c33; - m = sess->ptime * sess->frames_per_packet; - /* Calculate burst and densities. */ - if (c11 && (c23 || c33)) { - p32 = c32 / (c31 + c32 + c33); - if((c22 + c23) < 1) { - p23 = 1; + if (ctotal) { + pj_uint32_t p32, p23; + + //original version: + //p32 = c32 / (c31 + c32 + c33); + if (c31 + c32 + c33 == 0) + p32 = 0; + else + p32 = (c32 << 16) / (c31 + c32 + c33); + + //original version: + //if ((c22 + c23) < 1) { + // p23 = 1; + //} else { + // p23 = 1 - c22 / (c22 + c23); + //} + if (c23 == 0) { + p23 = 0; } else { - p23 = 1 - c22/(c22 + c23); + p23 = (c23 << 16) / (c22 + c23); } - sess->stat.rx.voip_mtc.burst_den = (pj_uint8_t)(256*p23/(p23 + p32)); - sess->stat.rx.voip_mtc.gap_den = (pj_uint8_t)(256*c14/(c11 + c14)); - /* Calculate burst and gap durations in ms */ - sess->stat.rx.voip_mtc.gap_dur = (pj_uint16_t)((c11+c14+c13)*m/c13); - sess->stat.rx.voip_mtc.burst_dur = (pj_uint16_t)(ctotal*m/c13 - - sess->stat.rx.voip_mtc.gap_dur); + /* Calculate loss/discard densities, scaled of 0-256 */ + if (c11 == 0) + sess->stat.rx.voip_mtc.gap_den = 0; + else + sess->stat.rx.voip_mtc.gap_den = (pj_uint8_t) + ((c14 << 8) / (c11 + c14)); + if (p23 == 0) + sess->stat.rx.voip_mtc.burst_den = 0; + else + sess->stat.rx.voip_mtc.burst_den = (pj_uint8_t) + ((p23 << 8) / (p23 + p32)); + + /* Calculate (average) durations, in ms */ + if (c13 == 0) { + c13 = 1; + ctotal += 1; + } + sess->stat.rx.voip_mtc.gap_dur = (pj_uint16_t) + ((c11+c14+c13) * m / c13); + sess->stat.rx.voip_mtc.burst_dur = (pj_uint16_t) + ((ctotal - (c11+c14+c13)) * m / c13); + + /* Callculate loss/discard rates, scaled 0-256 */ + sess->stat.rx.voip_mtc.loss_rate = (pj_uint8_t) + ((sess->voip_mtc_stat.loss_count << 8) / ctotal); + sess->stat.rx.voip_mtc.discard_rate = (pj_uint8_t) + ((sess->voip_mtc_stat.discard_count << 8) / ctotal); } else { - /* No burst occurred yet until this time? - * Just report full gap. - */ - ctotal = sess->rtcp_session->stat.rx.pkt + - sess->voip_mtc_stat.loss_count + - sess->voip_mtc_stat.discard_count; - + /* No lost/discarded packet yet. */ + sess->stat.rx.voip_mtc.gap_den = 0; sess->stat.rx.voip_mtc.burst_den = 0; - sess->stat.rx.voip_mtc.gap_den = (pj_uint8_t)(256 * - (sess->voip_mtc_stat.loss_count + - sess->voip_mtc_stat.discard_count) / - ctotal); - - /* Calculate burst and gap durations in ms */ - sess->stat.rx.voip_mtc.gap_dur = (pj_uint16_t)((m*ctotal) < 0xFFFF? - (m*ctotal) : 0xFFFF); + sess->stat.rx.voip_mtc.gap_dur = 0; sess->stat.rx.voip_mtc.burst_dur = 0; + sess->stat.rx.voip_mtc.loss_rate = 0; + sess->stat.rx.voip_mtc.discard_rate = 0; } - /* Calculate loss and discard rates */ - sess->stat.rx.voip_mtc.loss_rate = (pj_uint8_t) - (256 * sess->voip_mtc_stat.loss_count / ctotal); - sess->stat.rx.voip_mtc.discard_rate = (pj_uint8_t) - (256 * sess->voip_mtc_stat.discard_count / ctotal); - /* Set round trip delay (in ms) to RTT calculated after receiving * DLRR or DLSR. */ @@ -404,7 +424,8 @@ void pjmedia_rtcp_xr_rx_rtcp_xr( pjmedia_rtcp_xr_session *sess, pkt_len = pj_ntohs((pj_uint16_t)rtcp_xr->common.length); - pj_assert((pkt_len + 1) <= (size / 4)); + if ((pkt_len + 1) > (size / 4)) + return; /* Parse report rpt_types */ while ((pj_int32_t*)rb_hdr < (pj_int32_t*)pkt + pkt_len) diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtp.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/rtp.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/rtp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp_cmp.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_cmp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp_cmp.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_cmp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp_neg.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_neg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sdp_neg.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sdp_neg.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/session.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/session.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/session.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/session.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/silencedet.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/silencedet.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/silencedet.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/silencedet.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sound_port.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sound_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/sound_port.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/sound_port.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/splitcomb.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/splitcomb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/splitcomb.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/splitcomb.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/stereo_port.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stereo_port.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/stereo_port.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stereo_port.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/stream.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stream.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/stream.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stream.c index 2493f065fde1d2679fae4ca4c4824f54077ebefc..ca518d73ccbdc48ffa679ec9038005e0227ffa10 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/stream.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/stream.c @@ -1,4 +1,4 @@ -/* $Id: stream.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: stream.c 2543 2009-03-23 13:22:45Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -52,8 +52,6 @@ struct pjmedia_channel pjmedia_dir dir; /**< Channel direction. */ unsigned pt; /**< Payload type. */ pj_bool_t paused; /**< Paused?. */ - unsigned in_pkt_size; /**< Size of input buffer. */ - void *in_pkt; /**< Input buffer. */ unsigned out_pkt_size; /**< Size of output buffer. */ void *out_pkt; /**< Output buffer. */ pjmedia_rtp_session rtp; /**< RTP session. */ @@ -1394,12 +1392,6 @@ static pj_status_t create_channel( pj_pool_t *pool, channel->paused = 1; channel->pt = pt; - /* Allocate buffer for incoming packet. */ - - channel->in_pkt_size = PJMEDIA_MAX_MTU; - channel->in_pkt = pj_pool_alloc( pool, channel->in_pkt_size ); - PJ_ASSERT_RETURN(channel->in_pkt != NULL, PJ_ENOMEM); - /* Allocate buffer for outgoing packet. */ @@ -1667,25 +1659,26 @@ PJ_DEF(pj_status_t) pjmedia_stream_create( pjmedia_endpt *endpt, #endif /* Init jitter buffer parameters: */ - if (info->jb_max > 0) - jb_max = info->jb_max; + if (info->jb_max >= stream->codec_param.info.frm_ptime) + jb_max = (info->jb_max + stream->codec_param.info.frm_ptime - 1) / + stream->codec_param.info.frm_ptime; else jb_max = 500 / stream->codec_param.info.frm_ptime; - if (info->jb_min_pre > 0) - jb_min_pre = info->jb_min_pre; + if (info->jb_min_pre >= stream->codec_param.info.frm_ptime) + jb_min_pre = info->jb_min_pre / stream->codec_param.info.frm_ptime; else //jb_min_pre = 60 / stream->codec_param.info.frm_ptime; jb_min_pre = 1; - if (info->jb_max_pre > 0) - jb_max_pre = info->jb_max_pre; + if (info->jb_max_pre >= stream->codec_param.info.frm_ptime) + jb_max_pre = info->jb_max_pre / stream->codec_param.info.frm_ptime; else //jb_max_pre = 240 / stream->codec_param.info.frm_ptime; jb_max_pre = jb_max * 4 / 5; - if (info->jb_init > 0) - jb_init = info->jb_init; + if (info->jb_init >= stream->codec_param.info.frm_ptime) + jb_init = info->jb_init / stream->codec_param.info.frm_ptime; else //jb_init = (jb_min_pre + jb_max_pre) / 2; jb_init = 0; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/symbian_sound.cpp b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/symbian_sound.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/symbian_sound_aps.cpp b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound_aps.cpp similarity index 82% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/symbian_sound_aps.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound_aps.cpp index 4240769c34151829b82e72c936da3ae79ebc2523..85cf6106ae5beaad65e9b0d23838a4088469d0e3 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/symbian_sound_aps.cpp +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/symbian_sound_aps.cpp @@ -1,4 +1,4 @@ -/* $Id: symbian_sound_aps.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: symbian_sound_aps.cpp 2540 2009-03-23 13:18:19Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -20,8 +20,10 @@ #include <pjmedia/sound.h> #include <pjmedia/alaw_ulaw.h> #include <pjmedia/errno.h> +#include <pjmedia/symbian_sound_aps.h> #include <pj/assert.h> #include <pj/log.h> +#include <pj/math.h> #include <pj/os.h> #include <e32msgqueue.h> @@ -267,7 +269,6 @@ public: ~CPjAudioEngine(); static CPjAudioEngine *NewL(pjmedia_snd_stream *parent_strm, - pjmedia_dir dir, pjmedia_snd_rec_cb rec_cb, pjmedia_snd_play_cb play_cb, void *user_data); @@ -279,7 +280,6 @@ public: private: CPjAudioEngine(pjmedia_snd_stream *parent_strm, - pjmedia_dir dir, pjmedia_snd_rec_cb rec_cb, pjmedia_snd_play_cb play_cb, void *user_data); @@ -299,7 +299,6 @@ private: State state_; pjmedia_snd_stream *parentStrm_; - pjmedia_dir dir_; pjmedia_snd_rec_cb recCb_; pjmedia_snd_play_cb playCb_; void *userData_; @@ -316,16 +315,26 @@ private: CQueueHandler *iPlayCommHandler; CQueueHandler *iRecCommHandler; CQueueHandler *iRecHandler; + + static pj_uint8_t aps_samples_per_frame; + + pj_int16_t *play_buf; + pj_uint16_t play_buf_len; + pj_uint16_t play_buf_start; + pj_int16_t *rec_buf; + pj_uint16_t rec_buf_len; }; +pj_uint8_t CPjAudioEngine::aps_samples_per_frame = 0; + + CPjAudioEngine* CPjAudioEngine::NewL(pjmedia_snd_stream *parent_strm, - pjmedia_dir dir, pjmedia_snd_rec_cb rec_cb, pjmedia_snd_play_cb play_cb, void *user_data) { - CPjAudioEngine* self = new (ELeave) CPjAudioEngine(parent_strm, dir, + CPjAudioEngine* self = new (ELeave) CPjAudioEngine(parent_strm, rec_cb, play_cb, user_data); CleanupStack::PushL(self); @@ -335,13 +344,11 @@ CPjAudioEngine* CPjAudioEngine::NewL(pjmedia_snd_stream *parent_strm, } CPjAudioEngine::CPjAudioEngine(pjmedia_snd_stream *parent_strm, - pjmedia_dir dir, pjmedia_snd_rec_cb rec_cb, pjmedia_snd_play_cb play_cb, void *user_data) : state_(STATE_NULL), parentStrm_(parent_strm), - dir_(dir), recCb_(rec_cb), playCb_(play_cb), userData_(user_data), @@ -360,10 +367,22 @@ CPjAudioEngine::~CPjAudioEngine() delete iRecCommHandler; iRecCommHandler = NULL; + // On some devices, immediate closing after stopping may cause APS server + // panic KERN-EXEC 0, so let's wait for sometime before really closing + // the client session. + TTime start, now; + enum { APS_CLOSE_WAIT_TIME = 200 }; /* in msecs */ + + start.UniversalTime(); + do { + pj_symbianos_poll(-1, APS_CLOSE_WAIT_TIME); + now.UniversalTime(); + } while (now.MicroSecondsFrom(start) < APS_CLOSE_WAIT_TIME * 1000); + iSession.Close(); if (state_ == STATE_READY) { - if (dir_ != PJMEDIA_DIR_PLAYBACK) { + if (parentStrm_->dir != PJMEDIA_DIR_PLAYBACK) { iReadQ.Close(); iReadCommQ.Close(); } @@ -473,6 +492,17 @@ void CPjAudioEngine::ConstructL() iSettings.iSettings.iChannels = EMMFMono; iSettings.iSettings.iSampleRate = EMMFSampleRate8000Hz; iSettings.iSettings.iVolume = 0; + + /* play_buf size is samples per frame of parent stream. */ + play_buf = (pj_int16_t*)pj_pool_alloc(parentStrm_->pool, + parentStrm_->samples_per_frame << 1); + play_buf_len = 0; + play_buf_start = 0; + + /* rec_buf size is samples per frame of parent stream. */ + rec_buf = (pj_int16_t*)pj_pool_alloc(parentStrm_->pool, + parentStrm_->samples_per_frame << 1); + rec_buf_len = 0; } TInt CPjAudioEngine::StartStreamL() @@ -483,28 +513,33 @@ TInt CPjAudioEngine::StartStreamL() iSession.SetCng(EFalse); iSession.SetVadMode(EFalse); iSession.SetPlc(EFalse); - iSession.SetEncoderMode(EALawOr20ms); - iSession.SetDecoderMode(EALawOr20ms); + iSession.SetEncoderMode(EULawOr30ms); + iSession.SetDecoderMode(EULawOr30ms); iSession.ActivateLoudspeaker(act_loudspeaker); // Not only playback - if (dir_ != PJMEDIA_DIR_PLAYBACK) { + if (parentStrm_->dir != PJMEDIA_DIR_PLAYBACK) { iRecHandler = CQueueHandler::NewL(this, &iReadQ, CQueueHandler::ERecordQueue); iRecHandler->Start(); iSession.Read(); + TRACE_((THIS_FILE, "APS recorder started")); } // Not only capture - if (dir_ != PJMEDIA_DIR_CAPTURE) { + if (parentStrm_->dir != PJMEDIA_DIR_CAPTURE) { iSession.Write(); + TRACE_((THIS_FILE, "APS player started")); } state_ = STATE_STREAMING; return 0; } +/////////////////////////////////////////////////////////// // Inherited from MQueueHandlerObserver +// + void CPjAudioEngine::InputStreamInitialized(const TInt aStatus) { TRACE_((THIS_FILE, "InputStreamInitialized %d", aStatus)); @@ -520,7 +555,7 @@ void CPjAudioEngine::OutputStreamInitialized(const TInt aStatus) TRACE_((THIS_FILE, "OutputStreamInitialized %d", aStatus)); if (aStatus == KErrNone) { - if (dir_ == PJMEDIA_DIR_PLAYBACK) { + if (parentStrm_->dir == PJMEDIA_DIR_PLAYBACK) { state_ = STATE_READY; // Only playback, start directly StartStreamL(); @@ -536,32 +571,92 @@ void CPjAudioEngine::NotifyError(const TInt aError) void CPjAudioEngine::RecCb(TAPSCommBuffer &buffer) { - pj_int16_t buf[160]; pj_assert(buffer.iBuffer[0] == 1 && buffer.iBuffer[1] == 0); - for (int i=0; i<160; ++i) - buf[i] = pjmedia_alaw2linear(buffer.iBuffer[i+2]); + /* Detect the recorder G.711 frame size, player frame size will follow + * this recorder frame size. + */ + if (CPjAudioEngine::aps_samples_per_frame == 0) { + CPjAudioEngine::aps_samples_per_frame = buffer.iBuffer.Length() < 160? + 80 : 160; + TRACE_((THIS_FILE, "Detected APS G.711 frame size = %u samples", + CPjAudioEngine::aps_samples_per_frame)); + } - recCb_(userData_, 0, buf, sizeof(buf)); + /* Decode APS buffer (coded in G.711) and put the PCM result into rec_buf. + * Whenever rec_buf is full, call parent stream callback. + */ + unsigned dec_len = 0; + + while (dec_len < CPjAudioEngine::aps_samples_per_frame) { + unsigned tmp; + + tmp = PJ_MIN(parentStrm_->samples_per_frame - rec_buf_len, + CPjAudioEngine::aps_samples_per_frame - dec_len); + pjmedia_ulaw_decode(&rec_buf[rec_buf_len], + buffer.iBuffer.Ptr() + 2 + dec_len, + tmp); + rec_buf_len += tmp; + dec_len += tmp; + + pj_assert(rec_buf_len <= parentStrm_->samples_per_frame); + + if (rec_buf_len == parentStrm_->samples_per_frame) { + recCb_(userData_, 0, rec_buf, rec_buf_len << 1); + rec_buf_len = 0; + } + } } void CPjAudioEngine::PlayCb(TAPSCommBuffer &buffer) { - pj_int16_t buf[160]; - - playCb_(userData_, 0, buf, sizeof(buf)); - buffer.iCommand = CQueueHandler::EAPSPlayData; buffer.iStatus = 0; buffer.iBuffer.Zero(); buffer.iBuffer.Append(1); buffer.iBuffer.Append(0); - for (int i=0; i<160; ++i) - buffer.iBuffer.Append(pjmedia_linear2alaw(buf[i])); + + /* Send 10ms silence frame if frame size hasn't been known. */ + if (CPjAudioEngine::aps_samples_per_frame == 0) { + pjmedia_zero_samples(play_buf, 80); + pjmedia_ulaw_encode((pj_uint8_t*)play_buf, play_buf, 80); + buffer.iBuffer.Append((TUint8*)play_buf, 80); + iWriteQ.Send(buffer); + return; + } + + unsigned enc_len = 0; + + /* Call parent stream callback to get PCM samples to play, + * encode the PCM samples into G.711 and put it into APS buffer. + */ + while (enc_len < CPjAudioEngine::aps_samples_per_frame) { + if (play_buf_len == 0) { + playCb_(userData_, 0, play_buf, parentStrm_->samples_per_frame<<1); + play_buf_len = parentStrm_->samples_per_frame; + play_buf_start = 0; + } + + unsigned tmp; + + tmp = PJ_MIN(play_buf_len, + CPjAudioEngine::aps_samples_per_frame - enc_len); + pjmedia_ulaw_encode((pj_uint8_t*)&play_buf[play_buf_start], + &play_buf[play_buf_start], + tmp); + buffer.iBuffer.Append((TUint8*)&play_buf[play_buf_start], tmp); + enc_len += tmp; + play_buf_len -= tmp; + play_buf_start += tmp; + } iWriteQ.Send(buffer); } +// +// End of inherited from MQueueHandlerObserver +///////////////////////////////////////////////////////////// + TInt CPjAudioEngine::ActivateSpeaker(TBool active) { @@ -641,8 +736,7 @@ static pj_status_t sound_open(pjmedia_dir dir, strm->samples_per_frame = samples_per_frame; // Create the audio engine. - TRAPD(err, strm->engine = CPjAudioEngine::NewL(strm, strm->dir, - rec_cb, play_cb, + TRAPD(err, strm->engine = CPjAudioEngine::NewL(strm, rec_cb, play_cb, user_data)); if (err != KErrNone) { pj_pool_release(pool); diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/tonegen.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/tonegen.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/tonegen.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/tonegen.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_adapter_sample.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_adapter_sample.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_adapter_sample.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_adapter_sample.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_ice.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_ice.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_ice.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_ice.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_loop.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_loop.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_loop.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_loop.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_srtp.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_srtp.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_srtp.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_srtp.c index 2fb6845ee9b697a8e714e3218d5b37eae53132e4..b9650d1b02c14c04a10993bf905dc6a748377aff 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_srtp.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_srtp.c @@ -1,4 +1,4 @@ -/* $Id: transport_srtp.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: transport_srtp.c 2533 2009-03-23 13:07:05Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -384,7 +384,6 @@ PJ_DEF(pj_status_t) pjmedia_transport_srtp_create( srtp->session_inited = PJ_FALSE; srtp->bypass_srtp = PJ_FALSE; srtp->probation_cnt = PROBATION_CNT_INIT; - srtp->peer_use = opt->use; if (opt) { srtp->setting = *opt; @@ -423,6 +422,9 @@ PJ_DEF(pj_status_t) pjmedia_transport_srtp_create( /* Set underlying transport */ srtp->member_tp = tp; + /* Initialize peer's SRTP usage mode. */ + srtp->peer_use = srtp->setting.use; + /* Done */ *p_tp = &srtp->base; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_udp.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_udp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/transport_udp.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/transport_udp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_player.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_player.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_player.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_player.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_playlist.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_playlist.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_playlist.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_playlist.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_writer.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_writer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wav_writer.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wav_writer.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wave.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wave.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wave.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wave.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wmme_sound.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wmme_sound.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wmme_sound.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wmme_sound.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wsola.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wsola.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/pjmedia/wsola.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/pjmedia/wsola.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/audio_tool.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/audio_tool.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/audio_tool.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/audio_tool.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/jbuf_test.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/jbuf_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/jbuf_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/jbuf_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/main.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/main.c similarity index 92% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/main.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/main.c index d36c8e4d7292e106cdf1944cb6b8f8a9f223474f..2a4cf8776cbca241d048ae632615ab64401c8517 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/main.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: main.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -39,7 +39,8 @@ int main(int argc, char *argv[]) if (argc == 2 && argv[1][0]=='-' && argv[1][1]=='i') { puts("\nPress <ENTER> to quit"); - fgets(s, sizeof(s), stdin); + if (fgets(s, sizeof(s), stdin) == NULL) + return rc; } return rc; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/mips_test.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/mips_test.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/mips_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/mips_test.c index 91f49c8b52780260e12c18ca6aa880c2342be78d..b4e738d31c3a210e1862e804ac199a25db58526c 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/mips_test.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/mips_test.c @@ -1,4 +1,4 @@ -/* $Id: mips_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: mips_test.c 2548 2009-03-23 13:28:30Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -881,6 +881,7 @@ static pjmedia_port* g722_encode_decode(pj_pool_t *pool, samples_per_frame, flags, te); } +#if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0 static pj_status_t init_l16_default(pjmedia_endpt *endpt) { return pjmedia_codec_l16_init(endpt, 0); @@ -913,6 +914,7 @@ static pjmedia_port* l16_16_encode_decode(pj_pool_t *pool, clock_rate, channel_count, samples_per_frame, flags, te); } +#endif /***************************************************************************/ /* WSOLA PLC mode */ @@ -2279,8 +2281,10 @@ int mips_test(void) { "codec encode/decode - iLBC", OP_PUT, K8, &ilbc_encode_decode}, { "codec encode/decode - Speex 8Khz", OP_PUT, K8, &speex8_encode_decode}, { "codec encode/decode - Speex 16Khz", OP_PUT, K16, &speex16_encode_decode}, +#if defined(PJMEDIA_HAS_L16_CODEC) && PJMEDIA_HAS_L16_CODEC!=0 { "codec encode/decode - L16/8000/1", OP_PUT, K8, &l16_8_encode_decode}, { "codec encode/decode - L16/16000/1", OP_PUT, K16, &l16_16_encode_decode}, +#endif { "stream TX/RX - G.711", OP_PUT_GET, K8, &create_stream_pcmu}, { "stream TX/RX - G.711 SRTP 32bit", OP_PUT_GET, K8, &create_stream_pcmu_srtp32_no_auth}, { "stream TX/RX - G.711 SRTP 32bit +auth", OP_PUT_GET, K8, &create_stream_pcmu_srtp32_with_auth}, diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/rtp_test.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/rtp_test.c similarity index 93% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/rtp_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/rtp_test.c index c4a4e9247ce039083a24ab63252e67436d1365b3..2a62520c4a19deb18736ec0c84aa4af43d3f1f72 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/rtp_test.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/rtp_test.c @@ -32,7 +32,10 @@ int rtp_test() pjmedia_rtp_session_init (&rtp, 4, 0x12345678); pjmedia_rtp_encode_rtp (&rtp, 4, 0, 0, 160, &rtphdr, &hdrlen); - fwrite (rtphdr, hdrlen, 1, fhnd); + if (fwrite (rtphdr, hdrlen, 1, fhnd) != 1) { + fclose(fhnd); + return -1; + } fclose(fhnd); return 0; } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/sdp_neg_test.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdp_neg_test.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/sdp_neg_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdp_neg_test.c index b86c2e34bdd36d2dfbceb90d6a970c9944e190a3..35c414cea67f364614b7ecb8163452b11c7c78bd 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/sdp_neg_test.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdp_neg_test.c @@ -1,4 +1,4 @@ -/* $Id: sdp_neg_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sdp_neg_test.c 2548 2009-03-23 13:28:30Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1328,7 +1328,7 @@ static int offer_answer_test(pj_pool_t *pool, pjmedia_sdp_neg **p_neg, pjmedia_sdp_neg *neg; pj_status_t status; - status = pjmedia_sdp_parse(pool, oa->sdp1, pj_native_strlen(oa->sdp1), + status = pjmedia_sdp_parse(pool, oa->sdp1, pj_ansi_strlen(oa->sdp1), &sdp1); if (status != PJ_SUCCESS) { app_perror(status, " error: unexpected parse status for sdp1"); @@ -1370,7 +1370,7 @@ static int offer_answer_test(pj_pool_t *pool, pjmedia_sdp_neg **p_neg, } /* Parse and validate remote answer */ - status = pjmedia_sdp_parse(pool, oa->sdp2, pj_native_strlen(oa->sdp2), + status = pjmedia_sdp_parse(pool, oa->sdp2, pj_ansi_strlen(oa->sdp2), &sdp2); if (status != PJ_SUCCESS) { app_perror(status, " error: parsing sdp2"); @@ -1405,7 +1405,7 @@ static int offer_answer_test(pj_pool_t *pool, pjmedia_sdp_neg **p_neg, } /* Parse and validate the correct active media. */ - status = pjmedia_sdp_parse(pool, oa->sdp3, pj_native_strlen(oa->sdp3), + status = pjmedia_sdp_parse(pool, oa->sdp3, pj_ansi_strlen(oa->sdp3), &sdp3); if (status != PJ_SUCCESS) { app_perror(status, " error: parsing sdp3"); @@ -1447,7 +1447,7 @@ static int offer_answer_test(pj_pool_t *pool, pjmedia_sdp_neg **p_neg, if (oa->sdp2) { /* Parse and validate initial local capability */ - status = pjmedia_sdp_parse(pool, oa->sdp2, pj_native_strlen(oa->sdp2), + status = pjmedia_sdp_parse(pool, oa->sdp2, pj_ansi_strlen(oa->sdp2), &sdp2); if (status != PJ_SUCCESS) { app_perror(status, " error: parsing sdp2"); @@ -1507,7 +1507,7 @@ static int offer_answer_test(pj_pool_t *pool, pjmedia_sdp_neg **p_neg, } /* Parse the correct answer. */ - status = pjmedia_sdp_parse(pool, oa->sdp3, pj_native_strlen(oa->sdp3), + status = pjmedia_sdp_parse(pool, oa->sdp3, pj_ansi_strlen(oa->sdp3), &sdp3); if (status != PJ_SUCCESS) { app_perror(status, " error: parsing sdp3"); diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/sdptest.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdptest.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/sdptest.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/sdptest.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/session_test.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/session_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/session_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/session_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/test.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/test.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/test.h b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/test.h rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/test.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/wince_main.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wince_main.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/wince_main.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wince_main.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/wsola_test.c b/sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wsola_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjmedia/src/test/wsola_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjmedia/src/test/wsola_test.c diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjnath-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjnath-test-x86_64-unknown-linux-gnu new file mode 100755 index 0000000000000000000000000000000000000000..04211592492fdd6811a6d506b60633266625aabb Binary files /dev/null and b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjnath-test-x86_64-unknown-linux-gnu differ diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-client-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-client-x86_64-unknown-linux-gnu new file mode 100755 index 0000000000000000000000000000000000000000..1069246a783679a577d95a9863aabcb7ccf686af Binary files /dev/null and b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-client-x86_64-unknown-linux-gnu differ diff --git a/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu new file mode 100755 index 0000000000000000000000000000000000000000..0d2af4648b03b5043df35934f540320bff1bd532 Binary files /dev/null and b/sflphone-common/libs/pjproject-1.0.2/pjnath/bin/pjturn-srv-x86_64-unknown-linux-gnu differ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/Makefile b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/Makefile rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjnath.dsp b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjnath.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjnath.dsw b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjnath.dsw rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.dsw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjnath.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjnath.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjnath_test.dsp b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjnath_test.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjnath_test.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.vcproj similarity index 92% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjnath_test.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.vcproj index d3427d74d11f3f7efc9a9d49ee296e0d9585c57b..a636b209cf8925143082d46a77729b3881d937c3 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjnath_test.vcproj +++ b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjnath_test.vcproj @@ -251,6 +251,14 @@ /> </FileConfiguration> </File> + <File + RelativePath="..\src\pjnath-test\server.c" + > + </File> + <File + RelativePath="..\src\pjnath-test\sess_auth.c" + > + </File> <File RelativePath="..\src\pjnath-test\stun.c" > @@ -273,6 +281,10 @@ /> </FileConfiguration> </File> + <File + RelativePath="..\src\pjnath-test\stun_sock_test.c" + > + </File> <File RelativePath="..\src\pjnath-test\test.c" > @@ -295,6 +307,10 @@ /> </FileConfiguration> </File> + <File + RelativePath="..\src\pjnath-test\turn_sock_test.c" + > + </File> </Filter> <Filter Name="Header Files" diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjstun_srv_test.dsp b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjstun_srv_test.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjstun_srv_test.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjstun_srv_test.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjstun_srv_test.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjturn_client.dsp b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjturn_client.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjturn_client.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjturn_client.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_client.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjturn_srv.dsp b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_srv.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/pjturn_srv.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/pjturn_srv.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_test_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_test_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_test_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_test_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_wince.vcw b/sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/build/wince-evc4/pjnath_wince.vcw rename to sflphone-common/libs/pjproject-1.0.2/pjnath/build/wince-evc4/pjnath_wince.vcw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/docs/UML-class-diagram.dia b/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.dia similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/docs/UML-class-diagram.dia rename to sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.dia diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/docs/UML-class-diagram.png b/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.png similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/docs/UML-class-diagram.png rename to sflphone-common/libs/pjproject-1.0.2/pjnath/docs/UML-class-diagram.png diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.cfg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/docs/doxygen.cfg rename to sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.cfg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/docs/doxygen.css b/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.css similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/docs/doxygen.css rename to sflphone-common/libs/pjproject-1.0.2/pjnath/docs/doxygen.css diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/docs/footer.html b/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/footer.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/docs/footer.html rename to sflphone-common/libs/pjproject-1.0.2/pjnath/docs/footer.html diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/docs/header.html b/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/header.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/docs/header.html rename to sflphone-common/libs/pjproject-1.0.2/pjnath/docs/header.html diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/docs/ice-arch.jpg b/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/ice-arch.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/docs/ice-arch.jpg rename to sflphone-common/libs/pjproject-1.0.2/pjnath/docs/ice-arch.jpg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/docs/stun-arch.jpg b/sflphone-common/libs/pjproject-1.0.2/pjnath/docs/stun-arch.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/docs/stun-arch.jpg rename to sflphone-common/libs/pjproject-1.0.2/pjnath/docs/stun-arch.jpg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/config.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/config.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/errno.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/errno.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/ice_session.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_session.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/ice_session.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_session.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/ice_strans.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_strans.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/ice_strans.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/ice_strans.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/nat_detect.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/nat_detect.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/nat_detect.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/nat_detect.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_auth.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_auth.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_auth.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_config.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_config.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_msg.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_msg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_msg.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_msg.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_session.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_session.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_session.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_session.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_sock.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_sock.h similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_sock.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_sock.h index 97c273be0a2f797b2f4977c6e28c6640afa310f5..a2a322486d6e6f02c85bedb5cdc5211f73239803 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_sock.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_sock.h @@ -1,4 +1,4 @@ -/* $Id: stun_sock.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: stun_sock.h 2531 2009-03-23 13:02:53Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -74,6 +74,12 @@ typedef enum pj_stun_sock_op */ PJ_STUN_SOCK_KEEP_ALIVE_OP, + /** + * IP address change notification from the keep-alive operation. + */ + PJ_STUN_SOCK_MAPPED_ADDR_CHANGE + + } pj_stun_sock_op; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_transaction.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_transaction.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/stun_transaction.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/stun_transaction.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/turn_session.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_session.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/turn_session.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_session.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/turn_sock.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_sock.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/turn_sock.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/turn_sock.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/types.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/include/pjnath/types.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/include/pjnath/types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/ice_test.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/ice_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/ice_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/ice_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/main.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main.c similarity index 92% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/main.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main.c index 3d1c2ccb7c7bdc3776fe688f13d12a4ef4882d09..301636dbe7f8509def181ef3ca482da24bdbc05d 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/main.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: main.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -53,7 +53,8 @@ int main(int argc, char *argv[]) char buf[10]; puts("Press <ENTER> to exit"); - fgets(buf, sizeof(buf), stdin); + if (fgets(buf, sizeof(buf), stdin) == NULL) + return rc; } return rc; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/main_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/main_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/main_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/server.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/server.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/server.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/server.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/server.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/sess_auth.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/sess_auth.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/sess_auth.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/sess_auth.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/stun.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/stun.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/stun_sock_test.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun_sock_test.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/stun_sock_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun_sock_test.c index d80ab320c125f4ed9ba811816b61b03c939bd65d..585355f04fbe1d143b9e5d566027f87e10b152a0 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/stun_sock_test.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/stun_sock_test.c @@ -1,4 +1,4 @@ -/* $Id: stun_sock_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: stun_sock_test.c 2531 2009-03-23 13:02:53Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -627,12 +627,16 @@ static int keep_alive_test(pj_stun_config *cfg) /* Check that client status is still okay and on_status() callback is NOT * called */ + /* No longer valid due to this ticket: + * http://trac.pjsip.org/repos/ticket/742 + if (client->on_status_cnt != 0) { PJ_LOG(3, (THIS_FILE, " error: on_status() must not be called on successful" "keep-alive when mapped-address does not change")); ret = -430; goto on_return; } + */ /* Check that client doesn't receive anything */ if (client->on_rx_data_cnt != 0) { PJ_LOG(3,(THIS_FILE, " error: client shouldn't have received anything")); @@ -686,7 +690,7 @@ static int keep_alive_test(pj_stun_config *cfg) goto on_return; } /* Check that callback was called with correct operation */ - if (client->last_op != PJ_STUN_SOCK_KEEP_ALIVE_OP) { + if (client->last_op != PJ_STUN_SOCK_MAPPED_ADDR_CHANGE) { PJ_LOG(3,(THIS_FILE, " error: expecting keep-alive operation status")); ret = -470; goto on_return; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/test.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/test.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/test.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/test.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/test.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/turn_sock_test.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/turn_sock_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath-test/turn_sock_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath-test/turn_sock_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/errno.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/errno.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/ice_session.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_session.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/ice_session.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_session.c index f0f6d9d851bf71e4859e5e0ba109c01917b9ea21..cb293d377576de675b295bbe236878c2fcb1ced1 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/ice_session.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_session.c @@ -1,4 +1,4 @@ -/* $Id: ice_session.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: ice_session.c 2419 2009-01-12 10:06:04Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -2457,7 +2457,6 @@ PJ_DEF(pj_status_t) pj_ice_sess_on_rx_pkt(pj_ice_sess *ice, pj_ice_sess_comp *comp; pj_ice_msg_data *msg_data = NULL; unsigned i; - pj_status_t stun_status; PJ_ASSERT_RETURN(ice, PJ_EINVAL); @@ -2465,8 +2464,8 @@ PJ_DEF(pj_status_t) pj_ice_sess_on_rx_pkt(pj_ice_sess *ice, comp = find_comp(ice, comp_id); if (comp == NULL) { - status = PJNATH_EICEINCOMPID; - goto on_return; + pj_mutex_unlock(ice->mutex); + return PJNATH_EICEINCOMPID; } /* Find transport */ @@ -2478,13 +2477,13 @@ PJ_DEF(pj_status_t) pj_ice_sess_on_rx_pkt(pj_ice_sess *ice, } if (msg_data == NULL) { pj_assert(!"Invalid transport ID"); - status = PJ_EINVAL; - goto on_return; + pj_mutex_unlock(ice->mutex); + return PJ_EINVAL; } - stun_status = pj_stun_msg_check((const pj_uint8_t*)pkt, pkt_size, - PJ_STUN_IS_DATAGRAM); - if (stun_status == PJ_SUCCESS) { + status = pj_stun_msg_check((const pj_uint8_t*)pkt, pkt_size, + PJ_STUN_IS_DATAGRAM); + if (status == PJ_SUCCESS) { status = pj_stun_session_on_rx_pkt(comp->stun_sess, pkt, pkt_size, PJ_STUN_IS_DATAGRAM, msg_data, NULL, src_addr, src_addr_len); @@ -2493,14 +2492,18 @@ PJ_DEF(pj_status_t) pj_ice_sess_on_rx_pkt(pj_ice_sess *ice, LOG4((ice->obj_name, "Error processing incoming message: %s", ice->tmp.errmsg)); } + pj_mutex_unlock(ice->mutex); } else { + /* Not a STUN packet. Call application's callback instead, but release + * the mutex now or otherwise we may get deadlock. + */ + pj_mutex_unlock(ice->mutex); + (*ice->cb.on_rx_data)(ice, comp_id, transport_id, pkt, pkt_size, src_addr, src_addr_len); + status = PJ_SUCCESS; } - -on_return: - pj_mutex_unlock(ice->mutex); return status; } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/ice_strans.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_strans.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/ice_strans.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_strans.c index f640ab51b102f0ca2aaaead6e8c6533a0a5638b9..b51c26998331f6d81fa40d4ba13a2bbd1daeda59 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/ice_strans.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/ice_strans.c @@ -1,4 +1,4 @@ -/* $Id: ice_strans.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: ice_strans.c 2531 2009-03-23 13:02:53Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1265,12 +1265,16 @@ static pj_bool_t stun_on_status(pj_stun_sock *stun_sock, } break; case PJ_STUN_SOCK_BINDING_OP: + case PJ_STUN_SOCK_MAPPED_ADDR_CHANGE: if (status == PJ_SUCCESS) { pj_stun_sock_info info; status = pj_stun_sock_get_info(stun_sock, &info); if (status == PJ_SUCCESS) { char ipaddr[PJ_INET6_ADDRSTRLEN+10]; + const char *op_name = (op==PJ_STUN_SOCK_BINDING_OP) ? + "Binding discovery complete" : + "srflx address changed"; pj_bool_t dup = PJ_FALSE; /* Eliminate the srflx candidate if the address is @@ -1308,9 +1312,9 @@ static pj_bool_t stun_on_status(pj_stun_sock *stun_sock, } PJ_LOG(4,(comp->ice_st->obj_name, - "Comp %d: Binding discovery complete, " + "Comp %d: %s, " "srflx address is %s", - comp->comp_id, + comp->comp_id, op_name, pj_sockaddr_print(&info.mapped_addr, ipaddr, sizeof(ipaddr), 3))); diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/nat_detect.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/nat_detect.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/nat_detect.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/nat_detect.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_auth.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_auth.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_auth.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_auth.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_msg.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_msg.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_msg_dump.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg_dump.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_msg_dump.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_msg_dump.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_session.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_session.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_session.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_session.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_sock.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_sock.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_sock.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_sock.c index f87fe46aec7109d185e120d64b9723a81ecc36bf..40ab8ad5891db05fb1f8a91045fb6558b84ee279 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_sock.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_sock.c @@ -1,4 +1,4 @@ -/* $Id: stun_sock.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: stun_sock.c 2531 2009-03-23 13:02:53Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -669,11 +669,13 @@ static void sess_on_request_complete(pj_stun_session *sess, pj_sockaddr_cp(&stun_sock->mapped_addr, &mapped_attr->sockaddr); - resched = (*stun_sock->cb.on_status)(stun_sock, op, PJ_SUCCESS); - - goto on_return; + if (op==PJ_STUN_SOCK_KEEP_ALIVE_OP) + op = PJ_STUN_SOCK_MAPPED_ADDR_CHANGE; } + /* Notify user */ + resched = (*stun_sock->cb.on_status)(stun_sock, op, PJ_SUCCESS); + on_return: /* Start/restart keep-alive timer */ if (resched) diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_transaction.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_transaction.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/stun_transaction.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/stun_transaction.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/turn_session.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_session.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/turn_session.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_session.c index cc904dc9623f5449f084f9bd2a778e467a6b6099..1edb2f944e7c911123a99b499754fffd77cf2bfd 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/turn_session.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_session.c @@ -1,4 +1,4 @@ -/* $Id: turn_session.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: turn_session.c 2407 2009-01-01 20:56:36Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1076,9 +1076,8 @@ static void on_session_fail( pj_turn_session *sess, PJ_LOG(4,(sess->obj_name, "Trying next server")); set_state(sess, PJ_TURN_STATE_RESOLVED); - break; - } while (status != PJ_SUCCESS); + } while (0); } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/turn_sock.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_sock.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjnath/turn_sock.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjnath/turn_sock.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-client/client_main.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-client/client_main.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-client/client_main.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-client/client_main.c index 94310ce750ef956343f44f84063c1f766d65e379..dc22ac75795a23d359a198e099015704053a907e 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-client/client_main.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-client/client_main.c @@ -1,4 +1,4 @@ -/* $Id: client_main.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: client_main.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -445,7 +445,8 @@ static void console_main(void) menu(); - fgets(input, sizeof(input), stdin); + if (fgets(input, sizeof(input), stdin) == NULL) + break; switch (input[0]) { case 'a': diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/allocation.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/allocation.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/allocation.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/allocation.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/auth.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/auth.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/auth.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/auth.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/auth.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/listener_tcp.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_tcp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/listener_tcp.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_tcp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/listener_udp.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_udp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/listener_udp.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/listener_udp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/main.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/main.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/main.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/main.c index a302be82e3b449a08c13272acdefb98236f0e44f..095745363198f24ad0b90143d6771c3c5d5b07dd 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/main.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: main.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -108,7 +108,8 @@ static void console_main(pj_turn_srv *srv) menu(); - fgets(line, sizeof(line), stdin); + if (fgets(line, sizeof(line), stdin) == NULL) + break; switch (line[0]) { case 'd': diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/server.c b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/server.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/server.c rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/server.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/turn.h b/sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/turn.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjnath/src/pjturn-srv/turn.h rename to sflphone-common/libs/pjproject-1.0.2/pjnath/src/pjturn-srv/turn.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjproject-vs8.sln b/sflphone-common/libs/pjproject-1.0.2/pjproject-vs8.sln similarity index 86% rename from sflphone-common/libs/pjproject-1.0.1/pjproject-vs8.sln rename to sflphone-common/libs/pjproject-1.0.2/pjproject-vs8.sln index f60d26c2a53bb50b03acc55044bb9fbe9850113a..e09a60ebc5d76aff7740e65af5a43c6a1b224837 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjproject-vs8.sln +++ b/sflphone-common/libs/pjproject-1.0.2/pjproject-vs8.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib", "pjlib\build\pjlib.vcproj", "{DA0E03ED-53A7-4050-8A85-90541C5509F8}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib_test", "pjlib\build\pjlib_test.vcproj", "{6AC3EF61-5A9E-4F43-A809-5B2FD1A43B16}" @@ -117,6 +117,28 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmilenage", "third_party\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libsrtp", "third_party\build\srtp\libsrtp.vcproj", "{F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjnath_test", "pjnath\build\pjnath_test.vcproj", "{553C094C-F581-4A80-9540-D5D7B398A2C6}" + ProjectSection(ProjectDependencies) = postProject + {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8} + {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} + {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} = {A5D9AA24-08ED-48B9-BD65-F0A25E96BFC4} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjmedia_test", "pjmedia\build\pjmedia_test.vcproj", "{21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}" + ProjectSection(ProjectDependencies) = postProject + {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} = {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858} + {4BF51C21-5A30-423B-82FE-1ED410E5769D} = {4BF51C21-5A30-423B-82FE-1ED410E5769D} + {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {FE07F272-AE7F-4549-9E9F-EF9B80CB1693} + {6794B975-4E84-4F49-B2DC-C31F2224E03E} = {6794B975-4E84-4F49-B2DC-C31F2224E03E} + {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} + {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} = {3CF9FFA9-8387-4635-9D1B-E7944CBEFEAA} + {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} = {4B059DBA-CD9C-4D0F-BE8C-FFB4EFD498E9} + {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} = {855DC8C0-D3E9-4A2E-AE47-116605A7BC9B} + {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {DA0E03ED-53A7-4050-8A85-90541C5509F8} + {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} = {B5FE16F8-3EDB-4110-BD80-B4238CC01E8D} + {E53AA5FF-B737-40AA-BD13-387EFA99023D} = {E53AA5FF-B737-40AA-BD13-387EFA99023D} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -215,6 +237,14 @@ Global {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Debug|Win32.Build.0 = Debug|Win32 {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|Win32.ActiveCfg = Release|Win32 {F0DBAA03-1BA3-4E3B-A2CA-727E3D3AB858}.Release|Win32.Build.0 = Release|Win32 + {553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug|Win32.ActiveCfg = Debug|Win32 + {553C094C-F581-4A80-9540-D5D7B398A2C6}.Debug|Win32.Build.0 = Debug|Win32 + {553C094C-F581-4A80-9540-D5D7B398A2C6}.Release|Win32.ActiveCfg = Release|Win32 + {553C094C-F581-4A80-9540-D5D7B398A2C6}.Release|Win32.Build.0 = Release|Win32 + {21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug|Win32.ActiveCfg = Debug|Win32 + {21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Debug|Win32.Build.0 = Debug|Win32 + {21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release|Win32.ActiveCfg = Release|Win32 + {21C0CECF-69DD-4F70-BC2B-9B4DE7F15277}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/sflphone-common/libs/pjproject-1.0.1/pjproject.dsw b/sflphone-common/libs/pjproject-1.0.2/pjproject.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjproject.dsw rename to sflphone-common/libs/pjproject-1.0.2/pjproject.dsw diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu new file mode 100755 index 0000000000000000000000000000000000000000..3f1ed10dc8e3c7e2a38ef4bbd8cab83a25d611aa Binary files /dev/null and b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/pjsua-x86_64-unknown-linux-gnu differ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/bin/samples/bootstrap.inc b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/samples/hack similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/bin/samples/bootstrap.inc rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/bin/samples/hack diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/Footprint.mak b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Footprint.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/Footprint.mak rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Footprint.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/Makefile b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/Makefile rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/Samples-vc.mak b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples-vc.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/Samples-vc.mak rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples-vc.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/Samples.mak b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/Samples.mak rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/Samples.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/get-footprint.py b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/get-footprint.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/get-footprint.py rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/get-footprint.py diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/os-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/os-win32.mak rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/os-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/pjsip_apps.dsw b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsip_apps.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/pjsip_apps.dsw rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsip_apps.dsw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/pjsua.dsp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/pjsua.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/pjsua.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/pjsua.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/pjsua.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/py_pjsua.dsp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/py_pjsua.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/py_pjsua.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/py_pjsua.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/py_pjsua.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/python_pjsua.dsp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/python_pjsua.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/python_pjsua.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/python_pjsua.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/sample_debug.dsp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/sample_debug.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/sample_debug.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/sample_debug.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/sample_debug.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/samples.dsp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/samples.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/samples.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/samples.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/samples.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/wince-evc4/wince_demos.vcw b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/wince-evc4/wince_demos.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/build/wince-evc4/wince_demos.vcw rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/build/wince-evc4/wince_demos.vcw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/main.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main.c similarity index 95% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/main.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main.c index da07c034fea63333e4fbc8009fd1b0056bb73873..10d9336524710b04151f9f23f6dd30a562601a89 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/main.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: main.c 2407 2009-01-01 20:56:36Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -52,7 +52,7 @@ static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType) PJ_LOG(3,(THIS_FILE, "Ctrl-C detected, quitting..")); app_destroy(); ExitProcess(1); - return TRUE; + PJ_UNREACHED(return TRUE;) default: diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/main_rtems.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main_rtems.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/main_rtems.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/main_rtems.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/pjsua_app.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/pjsua_app.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/pjsua_app.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/pjsua_app.c index f254d80111dcb7f1a4f39431a538a81b9cdd9ba5..ad3df904b6be652071afa52bbee19643f0af50b0 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua/pjsua_app.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua/pjsua_app.c @@ -1,4 +1,4 @@ -/* $Id: pjsua_app.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: pjsua_app.c 2544 2009-03-23 13:23:20Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -244,7 +244,7 @@ static void usage(void) puts (" --ec-tail=MSEC Set echo canceller tail length (default=256)"); puts (" --ec-opt=OPT Select echo canceller algorithm (0=default, "); puts (" 1=speex, 2=suppressor)"); - puts (" --ilbc-mode=MODE Set iLBC codec mode (20 or 30, default is 20)"); + puts (" --ilbc-mode=MODE Set iLBC codec mode (20 or 30, default is 30)"); puts (" --capture-dev=id Audio capture device ID (default=-1)"); puts (" --playback-dev=id Audio playback device ID (default=-1)"); puts (" --capture-lat=N Audio capture latency, in ms (default=100)"); @@ -1488,6 +1488,14 @@ static int write_settings(const struct app_config *config, pj_strcat2(&cfg, "\n#\n# Network settings:\n#\n"); + /* Nameservers */ + for (i=0; i<config->cfg.nameserver_count; ++i) { + pj_ansi_sprintf(line, "--nameserver %.*s\n", + (int)config->cfg.nameserver[i].slen, + config->cfg.nameserver[i].ptr); + pj_strcat2(&cfg, line); + } + /* Outbound proxy */ for (i=0; i<config->cfg.outbound_proxy_cnt; ++i) { pj_ansi_sprintf(line, "--outbound %.*s\n", @@ -2750,7 +2758,8 @@ static pj_bool_t simple_input(const char *title, char *buf, pj_size_t len) char *p; printf("%s (empty to cancel): ", title); fflush(stdout); - fgets(buf, len, stdin); + if (fgets(buf, len, stdin) == NULL) + return PJ_FALSE; /* Remove trailing newlines. */ for (p=buf; ; ++p) { @@ -2794,7 +2803,8 @@ static void ui_input_url(const char *title, char *buf, int len, printf("%s: ", title); fflush(stdout); - fgets(buf, len, stdin); + if (fgets(buf, len, stdin) == NULL) + return; len = strlen(buf); /* Left trim */ @@ -3023,7 +3033,8 @@ static void manage_codec_prio(void) "(e.g. \"speex/16000 200\"), empty to cancel:"); printf("Codec name (\"*\" for all) and priority: "); - fgets(input, sizeof(input), stdin); + if (fgets(input, sizeof(input), stdin) == NULL) + return; if (input[0]=='\r' || input[0]=='\n') { puts("Done"); return; @@ -4012,6 +4023,97 @@ on_exit: ; } +/***************************************************************************** + * A simple module to handle otherwise unhandled request. We will register + * this with the lowest priority. + */ + +/* Notification on incoming request */ +static pj_bool_t default_mod_on_rx_request(pjsip_rx_data *rdata) +{ + pjsip_tx_data *tdata; + pjsip_status_code status_code; + pj_status_t status; + + /* Don't respond to ACK! */ + if (pjsip_method_cmp(&rdata->msg_info.msg->line.req.method, + &pjsip_ack_method) == 0) + return PJ_TRUE; + + /* Create basic response. */ + if (pjsip_method_cmp(&rdata->msg_info.msg->line.req.method, + &pjsip_notify_method) == 0) + { + /* Unsolicited NOTIFY's, send with Bad Request */ + status_code = PJSIP_SC_BAD_REQUEST; + } else { + /* Probably unknown method */ + status_code = PJSIP_SC_METHOD_NOT_ALLOWED; + } + status = pjsip_endpt_create_response(pjsua_get_pjsip_endpt(), + rdata, status_code, + NULL, &tdata); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "Unable to create response", status); + return PJ_TRUE; + } + + /* Add Allow if we're responding with 405 */ + if (status_code == PJSIP_SC_METHOD_NOT_ALLOWED) { + const pjsip_hdr *cap_hdr; + cap_hdr = pjsip_endpt_get_capability(pjsua_get_pjsip_endpt(), + PJSIP_H_ALLOW, NULL); + if (cap_hdr) { + pjsip_msg_add_hdr(tdata->msg, pjsip_hdr_clone(tdata->pool, + cap_hdr)); + } + } + + /* Add User-Agent header */ + { + pj_str_t user_agent; + char tmp[80]; + const pj_str_t USER_AGENT = { "User-Agent", 10}; + pjsip_hdr *h; + + pj_ansi_snprintf(tmp, sizeof(tmp), "PJSUA v%s/%s", + pj_get_version(), PJ_OS_NAME); + pj_strdup2_with_null(tdata->pool, &user_agent, tmp); + + h = (pjsip_hdr*) pjsip_generic_string_hdr_create(tdata->pool, + &USER_AGENT, + &user_agent); + pjsip_msg_add_hdr(tdata->msg, h); + } + + pjsip_endpt_send_response2(pjsua_get_pjsip_endpt(), rdata, tdata, + NULL, NULL); + + return PJ_TRUE; +} + + +/* The module instance. */ +static pjsip_module mod_default_handler = +{ + NULL, NULL, /* prev, next. */ + { "mod-default-handler", 19 }, /* Name. */ + -1, /* Id */ + PJSIP_MOD_PRIORITY_APPLICATION+99, /* Priority */ + NULL, /* load() */ + NULL, /* start() */ + NULL, /* stop() */ + NULL, /* unload() */ + &default_mod_on_rx_request, /* on_rx_request() */ + NULL, /* on_rx_response() */ + NULL, /* on_tx_request. */ + NULL, /* on_tx_response() */ + NULL, /* on_tsx_state() */ + +}; + + + /***************************************************************************** * Public API @@ -4062,6 +4164,12 @@ pj_status_t app_init(int argc, char *argv[]) if (status != PJ_SUCCESS) return status; + /* Initialize our module to handle otherwise unhandled request */ + status = pjsip_endpt_register_module(pjsua_get_pjsip_endpt(), + &mod_default_handler); + if (status != PJ_SUCCESS) + return status; + #ifdef STEREO_DEMO stereo_demo(); #endif diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/README.TXT b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/README.TXT similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/README.TXT rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/README.TXT diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/StdAfx.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/StdAfx.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/StdAfx.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/StdAfx.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/StdAfx.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/newres.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/newres.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/newres.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/newres.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.ico b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.ico similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.ico rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.ico diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.rc b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.rc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.rc rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.rc diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/pjsua_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/resource.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/resource.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pjsua_wince/resource.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pjsua_wince/resource.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.rc b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.rc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.rc rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.rc diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcc b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcc rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcc diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcw b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJ.vcw rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJ.vcw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJDlg.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJDlg.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJDlg.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PocketPJDlg.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PocketPJDlg.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PopUpWnd.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PopUpWnd.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PopUpWnd.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/PopUpWnd.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/PopUpWnd.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/ReadMe.txt b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/ReadMe.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/ReadMe.txt rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/ReadMe.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/SettingsDlg.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/SettingsDlg.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/SettingsDlg.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/SettingsDlg.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/SettingsDlg.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/StdAfx.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/StdAfx.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/StdAfx.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/StdAfx.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/StdAfx.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/newres.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/newres.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/newres.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/newres.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/PocketPJ.ico b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.ico similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/PocketPJ.ico rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.ico diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/PocketPJ.rc2 diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/action.bmp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/action.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/action.bmp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/action.bmp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/blank.bmp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/blank.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/blank.bmp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/blank.bmp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/invisibl.bmp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/invisibl.bmp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.bmp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/invisibl.ico b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.ico similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/invisibl.ico rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/invisibl.ico diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/offline.bmp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/offline.bmp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.bmp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/offline.ico b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.ico similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/offline.ico rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/offline.ico diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/online.bmp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/online.bmp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.bmp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/online.ico b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.ico similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/res/online.ico rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/res/online.ico diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/resource.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/resource.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/pocketpj/resource.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/pocketpj/resource.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/DEPRECATED.txt b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/DEPRECATED.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/DEPRECATED.txt rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/DEPRECATED.txt diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/Makefile b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..10ed2fb30d7952e3b8d7ddb6838070c1ed7cd20c --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/Makefile @@ -0,0 +1,6 @@ +all: + python setup.py install + +clean: + python setup.py clean + rm -rf ./build diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/helper.mak b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/helper.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/helper.mak rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/helper.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/pjsua.py b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/pjsua.py rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua.py diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/pjsua_app.py b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua_app.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/pjsua_app.py rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/pjsua_app.py diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.def b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.def rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.def diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/py_pjsua.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/py_pjsua.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/setup.py b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/setup.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/py_pjsua/setup.py rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/py_pjsua/setup.py diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/Makefile b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/Makefile new file mode 100644 index 0000000000000000000000000000000000000000..43fe7bff70335316de393b53b6ed7ac1865cc11f --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/Makefile @@ -0,0 +1,9 @@ +all: + python setup.py install + +clean: + python setup.py clean + rm -rf ./build + +%: + python setup.py $@ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.def b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.def rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.def diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/_pjsua.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/_pjsua.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/helper.mak b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/helper.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/helper.mak rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/helper.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/pjsua.py b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/pjsua.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/pjsua.py rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/pjsua.py diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/call.py b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/call.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/call.py rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/call.py diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/presence.py b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/presence.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/presence.py rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/presence.py diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/registration.py b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/registration.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/registration.py rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/registration.py diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/simplecall.py b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/simplecall.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/samples/simplecall.py rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/samples/simplecall.py diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/setup-vc.py b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup-vc.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/setup-vc.py rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup-vc.py diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/setup.py b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/python/setup.py rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/python/setup.py diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/aectest.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/aectest.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/aectest.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/aectest.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/confbench.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confbench.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/confbench.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confbench.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/confsample.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confsample.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/confsample.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confsample.c index e5f79fc5ac2c38989cec96ed03da27a6918bbcb2..954d26e44a46ab5c5451ae8c443a43f4e7b46197 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/confsample.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/confsample.c @@ -1,4 +1,4 @@ -/* $Id: confsample.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: confsample.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -105,7 +105,8 @@ static pj_bool_t input(const char *title, char *buf, pj_size_t len) char *p; printf("%s (empty to cancel): ", title); fflush(stdout); - fgets(buf, len, stdin); + if (fgets(buf, len, stdin) == NULL) + return PJ_FALSE; /* Remove trailing newlines. */ for (p=buf; ; ++p) { @@ -268,7 +269,7 @@ int main(int argc, char *argv[]) char tmp1[10]; char tmp2[10]; char *err; - int src, dst, level; + int src, dst, level, dur; puts(""); conf_list(conf, 0); @@ -285,7 +286,8 @@ int main(int argc, char *argv[]) printf("Enter selection: "); fflush(stdout); - fgets(tmp, sizeof(tmp), stdin); + if (fgets(tmp, sizeof(tmp), stdin) == NULL) + break; switch (tmp[0]) { case 's': @@ -415,13 +417,13 @@ int main(int argc, char *argv[]) if (!input("Duration to monitor (in seconds)", tmp1, sizeof(tmp1)) ) continue; - strtol(tmp1, &err, 10); + dur = strtol(tmp1, &err, 10); if (*err) { puts("Invalid duration number"); continue; } - monitor_level(conf, src, tmp2[0], strtol(tmp1, &err, 10)); + monitor_level(conf, src, tmp2[0], dur); break; case 'q': diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/debug.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/debug.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/debug.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/debug.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/encdec.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/encdec.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/encdec.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/encdec.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/footprint.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/footprint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/footprint.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/footprint.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/invtester.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/invtester.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/invtester.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/invtester.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/latency.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/latency.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/latency.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/latency.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/level.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/level.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/level.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/level.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/main_rtems.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/main_rtems.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/main_rtems.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/main_rtems.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/mix.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/mix.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/mix.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/mix.c index 05f77252178ddc5244b7c1bc5e77783b7288bb72..48c8fd8b00b86653fef6b41f076b0ecac3f7936d 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/mix.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/mix.c @@ -1,4 +1,4 @@ -/* $Id: mix.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: mix.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -129,7 +129,8 @@ int main(int argc, char *argv[]) printf("File %s exists, overwrite? [Y/N] ", out_fname); fflush(stdout); - fgets(in, sizeof(in), stdin); + if (fgets(in, sizeof(in), stdin) == NULL) + return 1; if (pj_tolower(in[0]) != 'y') return 1; } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/pcaputil.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pcaputil.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/pcaputil.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pcaputil.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/pjsip-perf.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pjsip-perf.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/pjsip-perf.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pjsip-perf.c index 3bb36c1aaec006f03ac320126e2a6aef139ad901..830a93542cc3303d130298f572882fd28659050f 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/pjsip-perf.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/pjsip-perf.c @@ -1,4 +1,4 @@ -/* $Id: pjsip-perf.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: pjsip-perf.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1809,7 +1809,7 @@ int main(int argc, char *argv[]) } else { /* Server mode */ - char s[10]; + char s[10], *unused; pj_status_t status; unsigned i; @@ -1844,7 +1844,8 @@ int main(int argc, char *argv[]) puts("\nPress <ENTER> to quit\n"); fflush(stdout); - fgets(s, sizeof(s), stdin); + unused = fgets(s, sizeof(s), stdin); + PJ_UNUSED_ARG(unused); app.thread_quit = PJ_TRUE; for (i=0; i<app.thread_count; ++i) { diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/playfile.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playfile.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/playfile.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playfile.c index 37c2f4ac01032e72314507ef5342a6b2cdb17aac..1e7ef0c329ef3a9edd95314c334512292b26893a 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/playfile.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playfile.c @@ -1,4 +1,4 @@ -/* $Id: playfile.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: playfile.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -172,7 +172,9 @@ int main(int argc, char *argv[]) puts(""); puts("Press <ENTER> to stop playing and quit"); - fgets(tmp, sizeof(tmp), stdin); + if (fgets(tmp, sizeof(tmp), stdin) == NULL) { + puts("EOF while reading stdin, will quit now.."); + } /* Start deinitialization: */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/playsine.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playsine.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/playsine.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playsine.c index 4d16aa5c72988fa06cefc81d1e74637c7a7577fe..93372477b4f91639e89bef10ec5ce8a2a232e543 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/playsine.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/playsine.c @@ -1,4 +1,4 @@ -/* $Id: playsine.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: playsine.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -277,7 +277,9 @@ int main(int argc, char *argv[]) puts(""); puts("Press <ENTER> to stop playing and quit"); - fgets(tmp, sizeof(tmp), stdin); + if (fgets(tmp, sizeof(tmp), stdin) == NULL) { + puts("EOF while reading stdin, will quit now.."); + } /* Start deinitialization: */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/proxy.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/proxy.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/proxy.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/proxy.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/recfile.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/recfile.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/recfile.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/recfile.c index 36c3f0c702bdc7db694dbdf2f0af7de74903ecab..1d13547c20c02a0ce21844794f1b0ae6a4a1c373 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/recfile.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/recfile.c @@ -1,4 +1,4 @@ -/* $Id: recfile.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: recfile.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -167,7 +167,9 @@ int main(int argc, char *argv[]) puts(""); puts("Press <ENTER> to stop recording and quit"); - fgets(tmp, sizeof(tmp), stdin); + if (fgets(tmp, sizeof(tmp), stdin) == NULL) { + puts("EOF while reading stdin, will quit now.."); + } /* Start deinitialization: */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/resampleplay.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/resampleplay.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/resampleplay.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/resampleplay.c index 7af443f05ac20e50c3909d69df9d99899ead1032..63b4594a8cc330a6bf38a6f130b46064bd55840f 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/resampleplay.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/resampleplay.c @@ -1,4 +1,4 @@ -/* $Id: resampleplay.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: resampleplay.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -190,8 +190,9 @@ int main(int argc, char *argv[]) puts(""); puts("Press <ENTER> to stop playing and quit"); - fgets(tmp, sizeof(tmp), stdin); - + if (fgets(tmp, sizeof(tmp), stdin) == NULL) { + puts("EOF while reading stdin, will quit now.."); + } /* Start deinitialization: */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/simple_pjsua.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simple_pjsua.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/simple_pjsua.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simple_pjsua.c index 9f715d1b44ad7204221c98e6d1d930a9c500d747..3086de6d51e357b0ea02a93b9cc84f05bdc92104 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/simple_pjsua.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simple_pjsua.c @@ -1,4 +1,4 @@ -/* $Id: simple_pjsua.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: simple_pjsua.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -182,7 +182,10 @@ int main(int argc, char *argv[]) char option[10]; puts("Press 'h' to hangup all calls, 'q' to quit"); - fgets(option, sizeof(option), stdin); + if (fgets(option, sizeof(option), stdin) == NULL) { + puts("EOF while reading stdin, will quit now.."); + break; + } if (option[0] == 'q') break; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/simpleua.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simpleua.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/simpleua.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/simpleua.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/siprtp.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/siprtp.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp.c index 80a8c4cdee67bc06ebd383a6c9a7af7e1ae274b3..2735b247df9b8d04b14f042b422e554401d70871 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/siprtp.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp.c @@ -1,4 +1,4 @@ -/* $Id: siprtp.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: siprtp.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1862,7 +1862,8 @@ static pj_bool_t simple_input(const char *title, char *buf, pj_size_t len) char *p; printf("%s (empty to cancel): ", title); fflush(stdout); - fgets(buf, len, stdin); + if (fgets(buf, len, stdin) == NULL) + return PJ_FALSE; /* Remove trailing newlines. */ for (p=buf; ; ++p) { @@ -1898,7 +1899,10 @@ static void console_main() for (;;) { printf(">>> "); fflush(stdout); - fgets(input1, sizeof(input1), stdin); + if (fgets(input1, sizeof(input1), stdin) == NULL) { + puts("EOF while reading stdin, will quit now.."); + break; + } switch (input1[0]) { @@ -2020,7 +2024,8 @@ static void app_log_writer(int level, const char *buffer, int len) pj_log_write(level, buffer, len); if (log_file) { - fwrite(buffer, len, 1, log_file); + int count = fwrite(buffer, len, 1, log_file); + PJ_UNUSED_ARG(count); fflush(log_file); } } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/siprtp_report.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp_report.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/siprtp_report.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/siprtp_report.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/sipstateless.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sipstateless.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/sipstateless.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sipstateless.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/sndinfo.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndinfo.c similarity index 97% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/sndinfo.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndinfo.c index 63d93bd805726522fec1503736665129584d9fbf..42a39784e8258fc082ffd06747559b42de24de3d 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/sndinfo.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndinfo.c @@ -1,4 +1,4 @@ -/* $Id: sndinfo.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sndinfo.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -202,8 +202,9 @@ static int open_device(int dev_id, pjmedia_dir dir, /* Let playback/capture runs for a while */ //pj_thread_sleep(1000); puts("Press <ENTER> to stop"); - fgets(tmp, sizeof(tmp), stdin); - + if (fgets(tmp, sizeof(tmp), stdin) == NULL) { + puts("EOF while reading stdin, will quit now.."); + } pjmedia_snd_stream_close(strm); diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/sndtest.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndtest.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/sndtest.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/sndtest.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/stateful_proxy.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateful_proxy.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/stateful_proxy.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateful_proxy.c index a432dc211954f49462b2aa173210d1cfabecf39a..ffa24dab2caf449f4ccb2ec0ad6754b7537f0df7 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/stateful_proxy.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateful_proxy.c @@ -1,4 +1,4 @@ -/* $Id: stateful_proxy.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: stateful_proxy.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -555,7 +555,11 @@ int main(int argc, char *argv[]) " dd dump detailed status\n" ""); - fgets(line, sizeof(line), stdin); + if (fgets(line, sizeof(line), stdin) == NULL) { + puts("EOF while reading stdin, will quit now.."); + global.quit_flag = PJ_TRUE; + break; + } if (line[0] == 'q') { global.quit_flag = PJ_TRUE; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/stateless_proxy.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateless_proxy.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/stateless_proxy.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateless_proxy.c index 4ed9acd65a3ca03bfde596df8c9a79a9cb82d4fa..da60954c0a2e333a0fbb35e8bf343e72984cb397 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/stateless_proxy.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stateless_proxy.c @@ -1,4 +1,4 @@ -/* $Id: stateless_proxy.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: stateless_proxy.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -221,7 +221,11 @@ int main(int argc, char *argv[]) " dd dump detailed status\n" ""); - fgets(line, sizeof(line), stdin); + if (fgets(line, sizeof(line), stdin) == NULL) { + puts("EOF while reading stdin, will quit now.."); + global.quit_flag = PJ_TRUE; + break; + } if (line[0] == 'q') { global.quit_flag = PJ_TRUE; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/stereotest.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stereotest.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/stereotest.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stereotest.c index 557b78647f8d7c550fa4c76fb04529b23fb2c169..1ef18781e2571f3774a34f7e5c85fc92255c146a 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/stereotest.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/stereotest.c @@ -1,4 +1,4 @@ -/* $Id: stereotest.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: stereotest.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -295,8 +295,9 @@ int main(int argc, char *argv[]) puts(""); puts("Press <ENTER> to stop and quit"); - fgets(tmp, sizeof(tmp), stdin); - + if (fgets(tmp, sizeof(tmp), stdin) == NULL) { + puts("EOF while reading stdin, will quit now.."); + } /* Start deinitialization: */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/streamutil.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/streamutil.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/streamutil.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/streamutil.c index be68a0b538d545298c1cb0edfa072f6e69ed0220..4cb25e934c521a86a2cd761db49ddb7358a341d0 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/streamutil.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/streamutil.c @@ -1,4 +1,4 @@ -/* $Id: streamutil.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: streamutil.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -616,7 +616,10 @@ int main(int argc, char *argv[]) printf("Command: "); fflush(stdout); - fgets(tmp, sizeof(tmp), stdin); + if (fgets(tmp, sizeof(tmp), stdin) == NULL) { + puts("EOF while reading stdin, will quit now.."); + break; + } if (tmp[0] == 's') print_stream_stat(stream); diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/strerror.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/strerror.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/strerror.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/strerror.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/tonegen.c b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/tonegen.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/tonegen.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/tonegen.c index e77a67001b07f5bcf2bab2558db77a0e7be7b0eb..0c632d9db881f95995d94a4c6ab27fc59f87100f 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/tonegen.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/tonegen.c @@ -1,4 +1,4 @@ -/* $Id: tonegen.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: tonegen.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -127,8 +127,11 @@ int main() f = fopen("tonegen.pcm", "wb"); for (i=0; i<8000/SAMPLES_PER_FRAME; ++i) { + int count; pjmedia_port_get_frame(port, &frm); - fwrite(buf, SAMPLES_PER_FRAME, 2, f); + count = fwrite(buf, SAMPLES_PER_FRAME, 2, f); + if (count != 2) + break; } pj_assert(pjmedia_tonegen_is_busy(port) == 0); diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/util.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/samples/util.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/samples/util.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/main_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/main_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/main_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/main_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/symbian_ua_reg.rss diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/ua.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.cpp similarity index 89% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/ua.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.cpp index d9292681afc3a98f165822db2907ec9c584bfdfe..1aae6fffaf16a623ab864dbca08380ba72ae3aac 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/ua.cpp +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.cpp @@ -1,4 +1,4 @@ -/* $Id: ua.cpp 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: ua.cpp 2482 2009-03-02 15:50:12Z nanang $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -441,6 +441,7 @@ class ConsoleUI : public CActive { public: ConsoleUI(CConsoleBase *con); + ~ConsoleUI(); // Run console UI void Run(); @@ -466,6 +467,11 @@ ConsoleUI::ConsoleUI(CConsoleBase *con) CActiveScheduler::Add(this); } +ConsoleUI::~ConsoleUI() +{ + Stop(); +} + // Run console UI void ConsoleUI::Run() { @@ -476,7 +482,7 @@ void ConsoleUI::Run() // Stop console UI void ConsoleUI::Stop() { - DoCancel(); + Cancel(); } // Cancel asynchronous read. @@ -730,6 +736,96 @@ static void SelectIAP() #endif +// Class CConnMon to monitor network connection (RConnection). Whenever +// the connection is down, it will notify PJLIB and restart PJSUA-LIB. +class CConnMon : public CActive { +public: + static CConnMon* NewL(RConnection &conn, RSocketServ &sserver) { + CConnMon *self = new (ELeave) CConnMon(conn, sserver); + CleanupStack::PushL(self); + self->ConstructL(); + CleanupStack::Pop(self); + return self; + } + + void Start() { + conn_.ProgressNotification(nif_progress_, iStatus); + SetActive(); + } + + void Stop() { + Cancel(); + } + + ~CConnMon() { Stop(); } + +private: + CConnMon(RConnection &conn, RSocketServ &sserver) : + CActive(EPriorityHigh), + conn_(conn), + sserver_(sserver) + { + CActiveScheduler::Add(this); + } + + void ConstructL() {} + + void DoCancel() { + conn_.CancelProgressNotification(); + } + + void RunL() { + int stage = nif_progress_().iStage; + + if (stage == KLinkLayerClosed) { + pj_status_t status; + TInt err; + + // Tell pjlib that connection is down. + pj_symbianos_set_connection_status(PJ_FALSE); + + PJ_LOG(3, (THIS_FILE, "RConnection closed, restarting PJSUA..")); + + // Destroy pjsua + pjsua_destroy(); + PJ_LOG(3, (THIS_FILE, "PJSUA destroyed.")); + + // Reopen the connection + err = conn_.Open(sserver_); + if (err == KErrNone) + err = conn_.Start(); + if (err != KErrNone) { + CActiveScheduler::Stop(); + return; + } + + // Reinit Symbian OS param before pj_init() + pj_symbianos_params sym_params; + pj_bzero(&sym_params, sizeof(sym_params)); + sym_params.rsocketserv = &sserver_; + sym_params.rconnection = &conn_; + pj_symbianos_set_params(&sym_params); + + // Reinit pjsua + status = app_startup(); + if (status != PJ_SUCCESS) { + pjsua_perror(THIS_FILE, "app_startup() error", status); + CActiveScheduler::Stop(); + return; + } + + PJ_LOG(3, (THIS_FILE, "PJSUA restarted.")); + PrintMenu(); + } + + Start(); + } + + RConnection& conn_; + RSocketServ& sserver_; + TNifProgressBuf nif_progress_; +}; + //////////////////////////////////////////////////////////////////////////// int ua_main() { @@ -772,14 +868,20 @@ int ua_main() return status; } + // Run the UI ConsoleUI *con = new ConsoleUI(console); con->Run(); PrintMenu(); + // Init & start connection monitor + CConnMon *connmon = CConnMon::NewL(aConn, aSocketServer); + connmon->Start(); + CActiveScheduler::Start(); + delete connmon; delete con; // Dump memory statistics diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/ua.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua/ua.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua/ua.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/application.uidesign b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/application.uidesign similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/application.uidesign rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/application.uidesign diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.l01 diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.loc diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui.rss diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.l01 diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.loc diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiContainer.rssi diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.l01 diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.loc diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_guiSettingItemList.rssi diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.loc diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/data/symbian_ua_gui_reg.rss diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon.bmp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/list_icon_mask.bmp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon.bmp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/mark_icon_mask.bmp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/gfx/qgn_menu_symbian_ua_gui.svg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/ABLD.BAT diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/Icons_aif_scalable_dc.mk diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/bld.inf b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/bld.inf similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/bld.inf rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/bld.inf diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/group/symbian_ua_gui.mmp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/Symbian_ua_guiSettingItemListSettings.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.hrh diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_gui.pan diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiAppUi.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiApplication.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainer.hrh diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiContainerView.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiDocument.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemList.hrh diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/inc/symbian_ua_guiSettingItemListView.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.pkg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/sis/symbian_ua_gui.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/Symbian_ua_guiSettingItemListSets.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiAppUi.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiApplication.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainer.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiContainerView.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiDocument.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemList.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/src/symbian_ua_guiSettingItemListView.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiContainer.uidesign diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symbian_ua_gui/symbian_ua_guiSettingItemList.uidesign diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/app_main.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/app_main.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/app_main.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/app_main.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/main_symbian.cpp b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/main_symbian.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/main_symbian.cpp rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/main_symbian.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/symsndtest_reg.rss b/sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/symsndtest_reg.rss similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip-apps/src/symsndtest/symsndtest_reg.rss rename to sflphone-common/libs/pjproject-1.0.2/pjsip-apps/src/symsndtest/symsndtest_reg.rss diff --git a/sflphone-common/libs/pjproject-1.0.2/pjsip/bin/pjsip-test-x86_64-unknown-linux-gnu b/sflphone-common/libs/pjproject-1.0.2/pjsip/bin/pjsip-test-x86_64-unknown-linux-gnu new file mode 100755 index 0000000000000000000000000000000000000000..45542bd1c516ee8b685b2f16469808270c040be0 Binary files /dev/null and b/sflphone-common/libs/pjproject-1.0.2/pjsip/bin/pjsip-test-x86_64-unknown-linux-gnu differ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/Makefile b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/Makefile rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/os-auto.mak rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/os-rtems.mak b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-rtems.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/os-rtems.mak rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/os-rtems.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip.dsw b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip.dsw rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip.dsw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_core.dsp b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_core.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_core.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_core.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_core.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_simple.dsp b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_simple.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_simple.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_simple.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_simple.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_ua.dsp b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_ua.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_ua.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsip_ua.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsip_ua.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsua_lib.dsp b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsua_lib.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsua_lib.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/pjsua_lib.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/pjsua_lib.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/test_pjsip.dsp b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/test_pjsip.dsp rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/test_pjsip.vcproj b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.vcproj similarity index 95% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/test_pjsip.vcproj rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.vcproj index 7ac83454c38f79584a8c8cda9034bea061774cef..4f85ee74f67b548b33681fcba07569e1c32ea7f0 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/test_pjsip.vcproj +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/test_pjsip.vcproj @@ -73,7 +73,7 @@ Name="VCLinkerTool" AdditionalOptions="/FIXED:NO" AdditionalDependencies="dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib" - OutputFile="..\bin\test-pjsip-i386-win32-vc8-release.exe" + OutputFile="..\bin\pjsip-test-i386-win32-vc8-release.exe" LinkIncremental="1" SuppressStartupBanner="true" GenerateDebugInformation="true" @@ -167,7 +167,7 @@ <Tool Name="VCLinkerTool" AdditionalDependencies="dsound.lib dxguid.lib netapi32.lib mswsock.lib ws2_32.lib odbc32.lib odbccp32.lib ole32.lib" - OutputFile="..\bin\test-pjsip-i386-win32-vc8-debug.exe" + OutputFile="..\bin\pjsip-test-i386-win32-vc8-debug.exe" LinkIncremental="2" SuppressStartupBanner="true" GenerateDebugInformation="true" diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_core_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_core_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_core_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_core_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_simple_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_simple_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_simple_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_simple_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_ua_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_ua_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_ua_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_ua_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_wince.vcw b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_wince.vcw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsip_wince.vcw rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsip_wince.vcw diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsua_lib_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsua_lib_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/pjsua_lib_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/pjsua_lib_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/test_pjsip_wince.vcp b/sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/test_pjsip_wince.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/build/wince-evc4/test_pjsip_wince.vcp rename to sflphone-common/libs/pjproject-1.0.2/pjsip/build/wince-evc4/test_pjsip_wince.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/docs/PJSUA-TESTING.txt b/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/PJSUA-TESTING.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/docs/PJSUA-TESTING.txt rename to sflphone-common/libs/pjproject-1.0.2/pjsip/docs/PJSUA-TESTING.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/docs/TRANSPORT-PROBLEMS.TXT b/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/TRANSPORT-PROBLEMS.TXT similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/docs/TRANSPORT-PROBLEMS.TXT rename to sflphone-common/libs/pjproject-1.0.2/pjsip/docs/TRANSPORT-PROBLEMS.TXT diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/docs/doxygen.cfg b/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.cfg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/docs/doxygen.cfg rename to sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.cfg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/docs/doxygen.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/docs/doxygen.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/docs/doxygen.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/docs/footer.html b/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/footer.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/docs/footer.html rename to sflphone-common/libs/pjproject-1.0.2/pjsip/docs/footer.html diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/docs/header.html b/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/header.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/docs/header.html rename to sflphone-common/libs/pjproject-1.0.2/pjsip/docs/header.html diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/docs/pjsip-arch.jpg b/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-arch.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/docs/pjsip-arch.jpg rename to sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-arch.jpg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/docs/pjsip-perf.jpg b/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-perf.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/docs/pjsip-perf.jpg rename to sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsip-perf.jpg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/docs/pjsua.jpg b/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsua.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/docs/pjsua.jpg rename to sflphone-common/libs/pjproject-1.0.2/pjsip/docs/pjsua.jpg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/docs/siprtp.jpg b/sflphone-common/libs/pjproject-1.0.2/pjsip/docs/siprtp.jpg similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/docs/siprtp.jpg rename to sflphone-common/libs/pjproject-1.0.2/pjsip/docs/siprtp.jpg diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/errno.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/errno.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/errno.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/evsub.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/evsub.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/evsub_msg.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub_msg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/evsub_msg.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/evsub_msg.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/iscomposing.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/iscomposing.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/iscomposing.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/iscomposing.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/pidf.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/pidf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/pidf.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/pidf.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/presence.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/presence.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/presence.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/presence.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/publish.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/publish.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/publish.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/publish.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/rpid.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/rpid.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/rpid.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/rpid.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/types.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/types.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/xpidf.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/xpidf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-simple/xpidf.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-simple/xpidf.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_100rel.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_100rel.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_100rel.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_100rel.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_inv.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_inv.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_inv.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_inv.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_regc.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_regc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_regc.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_regc.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_replaces.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_replaces.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_replaces.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_replaces.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_xfer.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_xfer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip-ua/sip_xfer.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip-ua/sip_xfer.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/print_util.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/print_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/print_util.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/print_util.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_aka.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_aka.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_aka.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_aka.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_msg.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_msg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_msg.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_msg.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_parser.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_parser.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_auth_parser.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_auth_parser.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h similarity index 97% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h index a2c22b28d8492be01c592d6d5e760d651efd1987..ff184d20d616b16ad37f2b09f6d43c1ac2b9f35b 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h @@ -32,7 +32,7 @@ * But only do this if user doesn't explicitly configure in pj/config_site.h. */ #ifndef PJSIP_HAS_TLS_TRANSPORT -#define PJSIP_HAS_TLS_TRANSPORT 1 +/* #undef PJSIP_HAS_TLS_TRANSPORT */ #endif diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h.in b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_autoconf.h.in rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_autoconf.h.in diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_config.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_config.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_dialog.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_dialog.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_dialog.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_dialog.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_endpoint.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_endpoint.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_endpoint.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_endpoint.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_errno.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_errno.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_errno.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_errno.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_event.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_event.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_event.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_event.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_module.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_module.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_module.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_module.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_msg.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_msg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_msg.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_msg.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_parser.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_parser.h similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_parser.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_parser.h index 85ac781cd573c1ac2d9d8f7f5ed3b71eeb0e487f..b854c27e2ffffe26e5fe80d11a047b66f81dc170 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_parser.h +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_parser.h @@ -1,4 +1,4 @@ -/* $Id: sip_parser.h 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sip_parser.h 2538 2009-03-23 13:14:26Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -336,6 +336,9 @@ typedef struct pjsip_parser_const_t pj_cis_t pjsip_ALNUM_SPEC; /**< Decimal + Alpha. */ pj_cis_t pjsip_TOKEN_SPEC; /**< Token. */ pj_cis_t pjsip_TOKEN_SPEC_ESC; /**< Token without '%' character */ + pj_cis_t pjsip_VIA_PARAM_SPEC; /**< Via param is token + ":" for + IPv6. */ + pj_cis_t pjsip_VIA_PARAM_SPEC_ESC; /**< .. as above without '%' */ pj_cis_t pjsip_HEX_SPEC; /**< Hexadecimal digits. */ pj_cis_t pjsip_PARAM_CHAR_SPEC; /**< For scanning pname (or pvalue when it's not quoted.) in URI */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_private.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_private.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_private.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_private.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_resolve.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_resolve.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_resolve.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_resolve.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_tel_uri.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_tel_uri.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_tel_uri.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_tel_uri.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transaction.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transaction.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transaction.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transaction.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_loop.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_loop.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_loop.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_loop.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_tcp.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tcp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_tcp.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tcp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_tls.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tls.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_tls.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_tls.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_udp.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_udp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_transport_udp.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_transport_udp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_types.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_types.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_ua_layer.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_ua_layer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_ua_layer.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_ua_layer.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_uri.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_uri.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_uri.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_uri.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_util.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip/sip_util.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip/sip_util.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip_auth.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip_auth.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_auth.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip_simple.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_simple.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip_simple.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_simple.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip_ua.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_ua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsip_ua.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsip_ua.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsua-lib/pjsua.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsua-lib/pjsua.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsua-lib/pjsua_internal.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua_internal.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/include/pjsua-lib/pjsua_internal.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/include/pjsua-lib/pjsua_internal.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/errno.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/errno.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/errno.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/evsub.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/evsub.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/evsub_msg.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub_msg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/evsub_msg.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/evsub_msg.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/iscomposing.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/iscomposing.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/iscomposing.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/iscomposing.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/pidf.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/pidf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/pidf.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/pidf.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/presence.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/presence.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/presence_body.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence_body.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/presence_body.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/presence_body.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/publishc.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/publishc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/publishc.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/publishc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/rpid.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/rpid.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/rpid.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/rpid.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/xpidf.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/xpidf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-simple/xpidf.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-simple/xpidf.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_100rel.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_100rel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_100rel.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_100rel.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_inv.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_inv.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_inv.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_inv.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_reg.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_reg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_reg.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_reg.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_replaces.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_replaces.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_replaces.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_replaces.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_xfer.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_xfer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip-ua/sip_xfer.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip-ua/sip_xfer.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_aka.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_aka.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_aka.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_aka.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_client.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_client.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_client.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_client.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_msg.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_msg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_msg.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_msg.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_parser.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_parser.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_parser.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_parser.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_server.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_server.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_auth_server.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_auth_server.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_config.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_config.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_config.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_config.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_dialog.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_dialog.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_dialog.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_dialog.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_endpoint.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_endpoint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_endpoint.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_endpoint.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_errno.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_errno.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_errno.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_errno.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_msg.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_msg.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_msg.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_msg.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_parser.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_parser.c similarity index 94% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_parser.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_parser.c index 31cfa1a4f4a7f8051a60e18f6307371f13bdf42b..91f54687874c23ffc62c4a0f3fccc6b34d5d12d1 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_parser.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_parser.c @@ -1,4 +1,4 @@ -/* $Id: sip_parser.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sip_parser.c 2538 2009-03-23 13:14:26Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -54,8 +54,6 @@ */ #define GENERIC_URI_CHARS "#?;:@&=+-_.!~*'()%$,/" "%" -#define PJSIP_VERSION "SIP/2.0" - #define UNREACHED(expr) #define IS_NEWLINE(c) ((c)=='\r' || (c)=='\n') @@ -327,6 +325,14 @@ static pj_status_t init_parser() PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); pj_cis_del_str(&pconst.pjsip_TOKEN_SPEC_ESC, "%"); + status = pj_cis_dup(&pconst.pjsip_VIA_PARAM_SPEC, &pconst.pjsip_TOKEN_SPEC); + PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); + pj_cis_add_str(&pconst.pjsip_VIA_PARAM_SPEC, ":"); + + status = pj_cis_dup(&pconst.pjsip_VIA_PARAM_SPEC_ESC, &pconst.pjsip_TOKEN_SPEC_ESC); + PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); + pj_cis_add_str(&pconst.pjsip_VIA_PARAM_SPEC, ":"); + status = pj_cis_dup(&pconst.pjsip_HOST_SPEC, &pconst.pjsip_ALNUM_SPEC); PJ_ASSERT_RETURN(status == PJ_SUCCESS, status); pj_cis_add_str( &pconst.pjsip_HOST_SPEC, HOST); @@ -772,6 +778,8 @@ PJ_DEF(pj_bool_t) pjsip_find_msg( const char *buf, pj_size_t size, const char *pos; const char *line; int content_length = -1; + pj_str_t cur_msg; + const pj_str_t end_hdr = { "\n\r\n", 3}; *msg_size = size; @@ -781,8 +789,12 @@ PJ_DEF(pj_bool_t) pjsip_find_msg( const char *buf, pj_size_t size, } - /* Find the end of header area by finding an empty line. */ - pos = pj_ansi_strstr(buf, "\n\r\n"); + /* Find the end of header area by finding an empty line. + * Don't use plain strstr() since we want to be able to handle + * NULL character in the message + */ + cur_msg.ptr = (char*)buf; cur_msg.slen = size; + pos = pj_strstr(&cur_msg, &end_hdr); if (pos == NULL) { return PJSIP_EPARTIALMSG; } @@ -791,7 +803,7 @@ PJ_DEF(pj_bool_t) pjsip_find_msg( const char *buf, pj_size_t size, body_start = pos+3; /* Find "Content-Length" header the hard way. */ - line = pj_ansi_strchr(buf, '\n'); + line = pj_strchr(&cur_msg, '\n'); while (line && line < hdr_end) { ++line; if ( ((*line=='C' || *line=='c') && @@ -842,7 +854,9 @@ PJ_DEF(pj_bool_t) pjsip_find_msg( const char *buf, pj_size_t size, break; /* Go to next line. */ - line = pj_ansi_strchr(line, '\n'); + cur_msg.slen -= (line - cur_msg.ptr); + cur_msg.ptr = (char*)line; + line = pj_strchr(&cur_msg, '\n'); } /* Found Content-Length? */ @@ -893,6 +907,36 @@ PJ_DEF(pjsip_uri*) pjsip_parse_uri( pj_pool_t *pool, return NULL; } +/* SIP version */ +static void parse_sip_version(pj_scanner *scanner) +{ + pj_str_t SIP = { "SIP", 3 }; + pj_str_t V2 = { "2.0", 3 }; + pj_str_t sip, version; + + pj_scan_get( scanner, &pconst.pjsip_ALPHA_SPEC, &sip); + if (pj_scan_get_char(scanner) != '/') + on_syntax_error(scanner); + pj_scan_get_n( scanner, 3, &version); + if (pj_stricmp(&sip, &SIP) || pj_stricmp(&version, &V2)) + on_syntax_error(scanner); +} + +static pj_bool_t is_next_sip_version(pj_scanner *scanner) +{ + pj_str_t SIP = { "SIP", 3 }; + pj_str_t sip; + int c; + + c = pj_scan_peek(scanner, &pconst.pjsip_ALPHA_SPEC, &sip); + /* return TRUE if it is "SIP" followed by "/" or space. + * we include space since the "/" may be separated by space, + * although this would mean it would return TRUE if it is a + * request and the method is "SIP"! + */ + return c && (c=='/' || c==' ' || c=='\t') && pj_stricmp(&sip, &SIP)==0; +} + /* Internal function to parse SIP message */ static pjsip_msg *int_parse_msg( pjsip_parse_ctx *ctx, pjsip_parser_err_report *err_list) @@ -926,7 +970,7 @@ retry_parse: return NULL; /* Parse request or status line */ - if (pj_scan_stricmp_alnum( scanner, PJSIP_VERSION, 7) == 0) { + if (is_next_sip_version(scanner)) { msg = pjsip_msg_create(pool, PJSIP_RESPONSE_MSG); int_parse_status_line( scanner, &msg->line.status ); } else { @@ -1125,7 +1169,7 @@ PJ_DEF(void) pjsip_parse_uri_param_imp( pj_scanner *scanner, pj_pool_t *pool, } -/* Parse parameter (";" pname ["=" pvalue]) in header. */ +/* Parse parameter (";" pname ["=" pvalue]) in SIP header. */ static void int_parse_param( pj_scanner *scanner, pj_pool_t *pool, pj_str_t *pname, pj_str_t *pvalue, unsigned option) @@ -1513,9 +1557,7 @@ static void int_parse_req_line( pj_scanner *scanner, pj_pool_t *pool, pjsip_method_init_np( &req_line->method, &token); req_line->uri = int_parse_uri(scanner, pool, PJ_TRUE); - if (pj_scan_stricmp_alnum( scanner, PJSIP_VERSION, 7) != 0) - PJ_THROW( PJSIP_SYN_ERR_EXCEPTION); - pj_scan_advance_n (scanner, 7, 1); + parse_sip_version(scanner); pj_scan_get_newline( scanner ); } @@ -1525,10 +1567,7 @@ static void int_parse_status_line( pj_scanner *scanner, { pj_str_t token; - if (pj_scan_stricmp_alnum(scanner, PJSIP_VERSION, 7) != 0) - PJ_THROW(PJSIP_SYN_ERR_EXCEPTION); - pj_scan_advance_n( scanner, 7, 1); - + parse_sip_version(scanner); pj_scan_get( scanner, &pconst.pjsip_DIGIT_SPEC, &token); status_line->code = pj_strtoul(&token); if (*scanner->curptr != '\r' && *scanner->curptr != '\n') @@ -1618,12 +1657,32 @@ end: /* Parse generic string header. */ static void parse_generic_string_hdr( pjsip_generic_string_hdr *hdr, - pj_scanner *scanner ) + pjsip_parse_ctx *ctx) { - if (pj_cis_match(&pconst.pjsip_NOT_NEWLINE, *scanner->curptr)) + pj_scanner *scanner = ctx->scanner; + + hdr->hvalue.slen = 0; + + /* header may be mangled hence the loop */ + while (pj_cis_match(&pconst.pjsip_NOT_NEWLINE, *scanner->curptr)) { + pj_str_t next, tmp; + pj_scan_get( scanner, &pconst.pjsip_NOT_NEWLINE, &hdr->hvalue); - else - hdr->hvalue.slen = 0; + if (pj_scan_is_eof(scanner) || IS_NEWLINE(*scanner->curptr)) + break; + /* mangled, get next fraction */ + pj_scan_get( scanner, &pconst.pjsip_NOT_NEWLINE, &next); + /* concatenate */ + tmp.ptr = (char*)pj_pool_alloc(ctx->pool, + hdr->hvalue.slen + next.slen + 2); + tmp.slen = 0; + pj_strcpy(&tmp, &hdr->hvalue); + pj_strcat2(&tmp, " "); + pj_strcat(&tmp, &next); + tmp.ptr[tmp.slen] = '\0'; + + hdr->hvalue = tmp; + } parse_hdr_end(scanner); } @@ -1934,13 +1993,20 @@ static void int_parse_via_param( pjsip_via_hdr *hdr, pj_scanner *scanner, pj_str_t pname, pvalue; //Parse with PARAM_CHAR instead, to allow IPv6 + //No, back to using int_parse_param() for the "`" character! //int_parse_param( scanner, pool, &pname, &pvalue, 0); - /* Get ';' character */ + //parse_param_imp(scanner, pool, &pname, &pvalue, + // &pconst.pjsip_TOKEN_SPEC, + // &pconst.pjsip_TOKEN_SPEC_ESC, 0); + //int_parse_param(scanner, pool, &pname, &pvalue, 0); + // This should be the correct one: + // added special spec for Via parameter, basically token plus + // ":" to allow IPv6 address in the received param. pj_scan_get_char(scanner); - - parse_param_imp(scanner, pool, &pname, &pvalue, - &pconst.pjsip_PARAM_CHAR_SPEC, - &pconst.pjsip_PARAM_CHAR_SPEC_ESC, 0); + parse_param_imp(scanner, pool, &pname, &pvalue, + &pconst.pjsip_VIA_PARAM_SPEC, + &pconst.pjsip_VIA_PARAM_SPEC_ESC, + 0); if (!parser_stricmp(pname, pconst.pjsip_BRANCH_STR) && pvalue.slen) { hdr->branch_param = pvalue; @@ -2075,10 +2141,9 @@ static pjsip_hdr* parse_hdr_via( pjsip_parse_ctx *ctx ) else pj_list_insert_before(first, hdr); - if (pj_scan_stricmp_alnum( scanner, PJSIP_VERSION "/", 8) != 0) - PJ_THROW(PJSIP_SYN_ERR_EXCEPTION); - - pj_scan_advance_n( scanner, 8, 1); + parse_sip_version(scanner); + if (pj_scan_get_char(scanner) != '/') + on_syntax_error(scanner); pj_scan_get( scanner, &pconst.pjsip_TOKEN_SPEC, &hdr->transport); int_parse_host(scanner, &hdr->sent_by.host); @@ -2119,7 +2184,7 @@ static pjsip_hdr* parse_hdr_generic_string( pjsip_parse_ctx *ctx ) pjsip_generic_string_hdr *hdr; hdr = pjsip_generic_string_hdr_create(ctx->pool, NULL, NULL); - parse_generic_string_hdr(hdr, ctx->scanner); + parse_generic_string_hdr(hdr, ctx); return (pjsip_hdr*)hdr; } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_resolve.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_resolve.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_resolve.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_resolve.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_tel_uri.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_tel_uri.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_tel_uri.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_tel_uri.c index 73a56385109228f0ecf7a0d7e069b7411b34f4be..5e8d55e950bdd1eadfb1394183f6ab40c23c2e0f 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_tel_uri.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_tel_uri.c @@ -1,4 +1,4 @@ -/* $Id: sip_tel_uri.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sip_tel_uri.c 2536 2009-03-23 13:11:05Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -442,6 +442,7 @@ static void* tel_uri_parse( pj_scanner *scanner, pj_pool_t *pool, } scanner->skip_ws = skip_ws; + pj_scan_skip_whitespace(scanner); return uri; } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transaction.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transaction.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transaction.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transaction.c index a25abb9317d4dca01470b9f6b491987f70dad138..50b7cdb70fd960a286afaf233c45d2508b59dc8e 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transaction.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transaction.c @@ -1,4 +1,4 @@ -/* $Id: sip_transaction.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sip_transaction.c 2534 2009-03-23 13:09:09Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1376,6 +1376,9 @@ PJ_DEF(pj_status_t) pjsip_tsx_create_uas( pjsip_module *tsx_user, pj_memcpy(&tsx->addr, &tsx->res_addr.addr, tsx->res_addr.addr_len); tsx->addr_len = tsx->res_addr.addr_len; tsx->is_reliable = PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport); + } else { + tsx->is_reliable = + (tsx->res_addr.dst_host.flag & PJSIP_TRANSPORT_RELIABLE); } @@ -2315,7 +2318,7 @@ static pj_status_t tsx_on_state_proceeding_uas( pjsip_transaction *tsx, */ timeout = timeout_timer_val; - } else if (PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport)==0) { + } else if (!tsx->is_reliable) { /* For non-INVITE, start timer J at 64*T1 for unreliable * transport. @@ -2655,9 +2658,7 @@ static pj_status_t tsx_on_state_proceeding_uac(pjsip_transaction *tsx, /* Start Timer D with TD/T4 timer if unreliable transport is used. */ /* Note: tsx->transport may be NULL! */ - if ((tsx->transport && PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport)==0) - || ((tsx->transport_flag & PJSIP_TRANSPORT_RELIABLE) == 0)) - { + if (!tsx->is_reliable) { if (tsx->method.id == PJSIP_INVITE_METHOD) { timeout = td_timer_val; } else { @@ -2722,7 +2723,7 @@ static pj_status_t tsx_on_state_completed_uas( pjsip_transaction *tsx, /* Timer I is T4 timer for unreliable transports, and * zero seconds for reliable transports. */ - if (PJSIP_TRANSPORT_IS_RELIABLE(tsx->transport)==0) { + if (!tsx->is_reliable) { timeout.sec = 0; timeout.msec = 0; } else { diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_loop.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_loop.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_loop.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_loop.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_tcp.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tcp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_tcp.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tcp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_tls_ossl.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tls_ossl.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_tls_ossl.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_tls_ossl.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_udp.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_udp.c similarity index 96% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_udp.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_udp.c index b0215189ddd96e135cb5e7e1969e013d3fbb428a..c1d0a406f90d41f0aae56ba6e79936eea4070645 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_transport_udp.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_transport_udp.c @@ -1,4 +1,4 @@ -/* $Id: sip_transport_udp.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sip_transport_udp.c 2539 2009-03-23 13:17:30Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -494,10 +494,25 @@ static pj_status_t get_published_name(pj_sock_t sock, } } else { + /* If bound address specifies "INADDR_ANY" (IPv6), get the + * IP address of local hostname + */ + pj_uint32_t loop6[4] = { 0, 0, 0, 0}; + bound_name->port = pj_ntohs(tmp_addr.ipv6.sin6_port); + + if (pj_memcmp(&tmp_addr.ipv6.sin6_addr, loop6, sizeof(loop6))==0) { + status = pj_gethostip(tmp_addr.addr.sa_family, &tmp_addr); + if (status != PJ_SUCCESS) + return status; + } + status = pj_inet_ntop(tmp_addr.addr.sa_family, pj_sockaddr_get_addr(&tmp_addr), hostbuf, hostbufsz); + if (status == PJ_SUCCESS) { + bound_name->host.slen = pj_ansi_strlen(hostbuf); + } } @@ -509,7 +524,7 @@ static void udp_set_pub_name(struct udp_transport *tp, const pjsip_host_port *a_name) { enum { INFO_LEN = 80 }; - char local_addr[PJ_INET6_ADDRSTRLEN]; + char local_addr[PJ_INET6_ADDRSTRLEN+10]; pj_assert(a_name->host.slen != 0); pj_strdup_with_null(tp->base.pool, &tp->base.local_name.host, @@ -521,14 +536,11 @@ static void udp_set_pub_name(struct udp_transport *tp, tp->base.info = (char*) pj_pool_alloc(tp->base.pool, INFO_LEN); } - pj_inet_ntop(tp->base.local_addr.addr.sa_family, - pj_sockaddr_get_addr(&tp->base.local_addr), - local_addr, sizeof(local_addr)); + pj_sockaddr_print(&tp->base.local_addr, local_addr, sizeof(local_addr), 3); pj_ansi_snprintf( - tp->base.info, INFO_LEN, "udp %s:%d [published as %s:%d]", + tp->base.info, INFO_LEN, "udp %s [published as %s:%d]", local_addr, - pj_sockaddr_get_port(&tp->base.local_addr), tp->base.local_name.host.ptr, tp->base.local_name.port); } @@ -639,7 +651,7 @@ static pj_status_t transport_attach( pjsip_endpoint *endpt, { pj_pool_t *pool; struct udp_transport *tp; - const char *format; + const char *format, *ipv6_quoteb, *ipv6_quotee; unsigned i; pj_status_t status; @@ -647,10 +659,14 @@ static pj_status_t transport_attach( pjsip_endpoint *endpt, PJ_EINVAL); /* Object name. */ - if (type & PJSIP_TRANSPORT_IPV6) + if (type & PJSIP_TRANSPORT_IPV6) { format = "udpv6%p"; - else + ipv6_quoteb = "["; + ipv6_quotee = "]"; + } else { format = "udp%p"; + ipv6_quoteb = ipv6_quotee = ""; + } /* Create pool. */ pool = pjsip_endpt_create_pool(endpt, format, PJSIP_POOL_LEN_TRANSPORT, @@ -767,12 +783,14 @@ static pj_status_t transport_attach( pjsip_endpoint *endpt, /* Done. */ if (p_transport) *p_transport = &tp->base; - + PJ_LOG(4,(tp->base.obj_name, - "SIP %s started, published address is %.*s:%d", + "SIP %s started, published address is %s%.*s%s:%d", pjsip_transport_get_type_desc((pjsip_transport_type_e)tp->base.key.type), + ipv6_quoteb, (int)tp->base.local_name.host.slen, tp->base.local_name.host.ptr, + ipv6_quotee, tp->base.local_name.port)); return PJ_SUCCESS; @@ -859,7 +877,7 @@ PJ_DEF(pj_status_t) pjsip_udp_transport_start6(pjsip_endpoint *endpt, { pj_sock_t sock; pj_status_t status; - char addr_buf[PJ_INET_ADDRSTRLEN]; + char addr_buf[PJ_INET6_ADDRSTRLEN]; pjsip_host_port bound_name; PJ_ASSERT_RETURN(endpt && async_cnt, PJ_EINVAL); @@ -883,8 +901,8 @@ PJ_DEF(pj_status_t) pjsip_udp_transport_start6(pjsip_endpoint *endpt, a_name = &bound_name; } - return pjsip_udp_transport_attach( endpt, sock, a_name, async_cnt, - p_transport); + return pjsip_udp_transport_attach2(endpt, PJSIP_TRANSPORT_UDP6, + sock, a_name, async_cnt, p_transport); } /* @@ -981,7 +999,7 @@ PJ_DEF(pj_status_t) pjsip_udp_transport_restart(pjsip_transport *transport, tp = (struct udp_transport*) transport; if (option & PJSIP_UDP_TRANSPORT_DESTROY_SOCKET) { - char addr_buf[PJ_INET_ADDRSTRLEN]; + char addr_buf[PJ_INET6_ADDRSTRLEN]; pjsip_host_port bound_name; /* Request to recreate transport */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_ua_layer.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_ua_layer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_ua_layer.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_ua_layer.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_uri.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_uri.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_uri.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_uri.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util.c similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util.c index b0339e36406cdd2e014c441d791ff6447572c637..41eaaad9557315c5ba9be04c67b76dd13bd349d3 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util.c @@ -1,4 +1,4 @@ -/* $Id: sip_util.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: sip_util.c 2532 2009-03-23 13:06:24Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -854,12 +854,17 @@ PJ_DEF(pj_status_t) pjsip_process_route_set(pjsip_tx_data *tdata, PJSIP_ENOTREQUESTMSG); PJ_ASSERT_RETURN(dest_info != NULL, PJ_EINVAL); - /* Assert if the request contains strict route and strict - * route processing has been applied before. We need to - * restore the strict route with pjsip_restore_strict_route_set() - * before we can call this function again, otherwise strict - * route will be swapped twice! + /* If the request contains strict route, check that the strict route + * has been restored to its original values before processing the + * route set. The strict route is restored to the original values + * with pjsip_restore_strict_route_set(). If caller did not restore + * the strict route before calling this function, we need to call it + * here, or otherwise the strict-route and Request-URI will be swapped + * twice! */ + if (tdata->saved_strict_route != NULL) { + pjsip_restore_strict_route_set(tdata); + } PJ_ASSERT_RETURN(tdata->saved_strict_route==NULL, PJ_EBUG); /* Find the first and last "Route" headers from the message. */ diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util_proxy.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_proxy.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util_proxy.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_proxy.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util_statefull.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_statefull.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsip/sip_util_statefull.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsip/sip_util_statefull.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_acc.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_acc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_acc.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_acc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_call.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_call.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_call.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_call.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_core.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_core.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_core.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_core.c index f6e51a07cbeb1763f630a676941adaef00e07b79..b5dc17d787fb8b1f02bda76632b5ad0a73860487 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_core.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_core.c @@ -1,4 +1,4 @@ -/* $Id: pjsua_core.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: pjsua_core.c 2542 2009-03-23 13:21:01Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -89,7 +89,7 @@ PJ_DEF(void) pjsua_config_default(pjsua_config *cfg) { pj_bzero(cfg, sizeof(*cfg)); - cfg->max_calls = 4; + cfg->max_calls = ((PJSUA_MAX_CALLS) < 4) ? (PJSUA_MAX_CALLS) : 4; cfg->thread_cnt = 1; cfg->nat_type_in_sdp = 1; cfg->force_lr = PJ_TRUE; @@ -835,8 +835,10 @@ static void busy_sleep(unsigned msec) pj_time_val_normalize(&timeout); do { - while (pjsua_handle_events(10) > 0) - ; + int i; + i = msec / 10; + while (pjsua_handle_events(10) > 0 && i > 0) + --i; pj_gettimeofday(&now); } while (PJ_TIME_VAL_LT(now, timeout)); } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_im.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_im.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_im.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_im.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_media.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_media.c similarity index 99% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_media.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_media.c index 009b41fdcfa66d0c684b84a9025f7cbba0206f17..538f73e5701943695b969009d60f91f8a6fe4964 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_media.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_media.c @@ -1,4 +1,4 @@ -/* $Id: pjsua_media.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: pjsua_media.c 2541 2009-03-23 13:19:31Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -1241,6 +1241,9 @@ pj_status_t pjsua_media_channel_deinit(pjsua_call_id call_id) pjmedia_transport_close(call->med_tp); call->med_tp = call->med_orig; } + + check_snd_dev_idle(); + return PJ_SUCCESS; } diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_pres.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_pres.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/pjsua-lib/pjsua_pres.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/pjsua-lib/pjsua_pres.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/dlg_core_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dlg_core_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/dlg_core_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dlg_core_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/dns_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dns_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/dns_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/dns_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/inv_offer_answer_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/inv_offer_answer_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/inv_offer_answer_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/inv_offer_answer_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/main.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main.c similarity index 94% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/main.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main.c index 531559dcec81e0f01955f46a445bc4e35bd56c02..c7b3bf3e8cbcb3f2207ba26e55aad7c3e0793e9c 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/main.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: main.c 2408 2009-01-01 22:08:21Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -82,7 +82,8 @@ int main(int argc, char *argv[]) if (interractive) { char s[10]; printf("<Press ENTER to quit>\n"); fflush(stdout); - fgets(s, sizeof(s), stdin); + if (fgets(s, sizeof(s), stdin) == NULL) + return retval; } return retval; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/main_rtems.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_rtems.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/main_rtems.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_rtems.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/main_win32.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_win32.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/main_win32.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/main_win32.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/msg_err_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_err_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/msg_err_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_err_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/msg_logger.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_logger.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/msg_logger.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_logger.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/msg_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_test.c similarity index 90% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/msg_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_test.c index a9728617ebefbf0ebc92191d5754732fea462238..ddcc86a43142ae273cc3301d9d52d3d104fdbb74 100644 --- a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/msg_test.c +++ b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/msg_test.c @@ -1,4 +1,4 @@ -/* $Id: msg_test.c 2394 2008-12-23 17:27:53Z bennylp $ */ +/* $Id: msg_test.c 2546 2009-03-23 13:26:00Z bennylp $ */ /* * Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) * Copyright (C) 2003-2008 Benny Prijono <benny@prijono.org> @@ -73,6 +73,7 @@ struct test_msg "P-Associated-URI:\r\n" /* empty header without space */ "\r\n", &create_msg0, + 0, PJ_SUCCESS }, { @@ -100,6 +101,136 @@ struct test_msg "m=audio 3456 RTP/AVP 0 1 3 99\r\n" "a=rtpmap:0 PCMU/8000\r\n", &create_msg1, + 0, + PJ_SUCCESS +}, +{ + /* Torture message from RFC 4475 + * 3.1.1.1 A short tortuous INVITE + */ + "INVITE sip:vivekg@chair-dnrc.example.com;unknownparam SIP/2.0\n" + "TO :\n" + " sip:vivekg@chair-dnrc.example.com ; tag = 1918181833n\n" + "from : \"J Rosenberg \\\\\\\"\" <sip:jdrosen@example.com>\n" + " ;\n" + " tag = 98asjd8\n" + "MaX-fOrWaRdS: 0068\n" + "Call-ID: wsinv.ndaksdj@192.0.2.1\n" + "Content-Length : 150\n" + "cseq: 0009\n" + " INVITE\n" + "Via : SIP / 2.0\n" + " /UDP\n" + " 192.0.2.2;rport;branch=390skdjuw\n" + "s :\n" + "NewFangledHeader: newfangled value\n" + " continued newfangled value\n" + "UnknownHeaderWithUnusualValue: ;;,,;;,;\n" + "Content-Type: application/sdp\n" + "Route:\n" + " <sip:services.example.com;lr;unknownwith=value;unknown-no-value>\n" + "v: SIP / 2.0 / TCP spindle.example.com ;\n" + " branch = z9hG4bK9ikj8 ,\n" + " SIP / 2.0 / UDP 192.168.255.111 ; branch=\n" + " z9hG4bK30239\n" + "m:\"Quoted string \\\"\\\"\" <sip:jdrosen@example.com> ; newparam =\n" + " newvalue ;\n" + " secondparam ; q = 0.33\r\n" + "\r\n" + "v=0\r\n" + "o=mhandley 29739 7272939 IN IP4 192.0.2.3\r\n" + "s=-\r\n" + "c=IN IP4 192.0.2.4\r\n" + "t=0 0\r\n" + "m=audio 49217 RTP/AVP 0 12\r\n" + "m=video 3227 RTP/AVP 31\r\n" + "a=rtpmap:31 LPC\r\n", + NULL, + 0, + PJ_SUCCESS +}, +{ + /* Torture message from RFC 4475 + * 3.1.1.2 Wide Range of Valid Characters + */ + "!interesting-Method0123456789_*+`.%indeed'~ sip:1_unusual.URI~(to-be!sure)&isn't+it$/crazy?,/;;*:&it+has=1,weird!*pas$wo~d_too.(doesn't-it)@example.com SIP/2.0\n" + "Via: SIP/2.0/UDP host1.example.com;rport;branch=z9hG4bK-.!%66*_+`'~\n" + "To: \"BEL:\\\x07 NUL:\\\x00 DEL:\\\x7F\" <sip:1_unusual.URI~(to-be!sure)&isn't+it$/crazy?,/;;*@example.com>\n" + "From: token1~` token2'+_ token3*%!.- <sip:mundane@example.com> ;fromParam''~+*_!.-%=\"\xD1\x80\xD0\xB0\xD0\xB1\xD0\xBE\xD1\x82\xD0\xB0\xD1\x8E\xD1\x89\xD0\xB8\xD0\xB9\";tag=_token~1'+`*%!-.\n" + "Call-ID: intmeth.word%ZK-!.*_+'@word`~)(><:\\/\"][?}{\n" + "CSeq: 139122385 !interesting-Method0123456789_*+`.%indeed'~\n" + "Max-Forwards: 255\n" + "extensionHeader-!.%*+_`'~: \xEF\xBB\xBF\xE5\xA4\xA7\xE5\x81\x9C\xE9\x9B\xBB\n" + "Content-Length: 0\r\n\r\n", + NULL, + 641, + PJ_SUCCESS +}, +{ + /* Torture message from RFC 4475 + * 3.1.1.3 Valid Use of the % Escaping Mechanism + */ + "INVITE sip:sips%3Auser%40example.com@example.net SIP/2.0\n" + "To: sip:%75se%72@example.com\n" + "From: <sip:I%20have%20spaces@example.net>;tag=1234\n" + "Max-Forwards: 87\n" + "i: esc01.239409asdfakjkn23onasd0-3234\n" + "CSeq: 234234 INVITE\n" + "Via: SIP/2.0/UDP host5.example.net;rport;branch=z9hG4bKkdjuw\n" + "C: application/sdp\n" + "Contact:\n" + " <sip:cal%6Cer@192.168.0.2:5060;%6C%72;n%61me=v%61lue%25%34%31>\n" + "Content-Length: 150\r\n" + "\r\n" + "v=0\r\n" + "o=mhandley 29739 7272939 IN IP4 192.0.2.1\r\n" + "s=-\r\n" + "c=IN IP4 192.0.2.1\r\n" + "t=0 0\r\n" + "m=audio 49217 RTP/AVP 0 12\r\n" + "m=video 3227 RTP/AVP 31\r\n" + "a=rtpmap:31 LPC\r\n", + NULL, + 0, + PJ_SUCCESS +}, +{ + /* Torture message from RFC 4475 + * 3.1.1.4 Escaped Nulls in URIs + */ + "REGISTER sip:example.com SIP/2.0\r\n" + "To: sip:null-%00-null@example.com\r\n" + "From: sip:null-%00-null@example.com;tag=839923423\r\n" + "Max-Forwards: 70\r\n" + "Call-ID: escnull.39203ndfvkjdasfkq3w4otrq0adsfdfnavd\r\n" + "CSeq: 14398234 REGISTER\r\n" + "Via: SIP/2.0/UDP host5.example.com;rport;branch=z9hG4bKkdjuw\r\n" + "Contact: <sip:%00@host5.example.com>\r\n" + "Contact: <sip:%00%00@host5.example.com>\r\n" + "L:0\r\n" + "\r\n", + NULL, + 0, + PJ_SUCCESS +}, +{ + /* Torture message from RFC 4475 + * 3.1.1.5 Use of % When It Is Not an Escape + */ + "RE%47IST%45R sip:registrar.example.com SIP/2.0\r\n" + "To: \"%Z%45\" <sip:resource@example.com>\r\n" + "From: \"%Z%45\" <sip:resource@example.com>;tag=f232jadfj23\r\n" + "Call-ID: esc02.asdfnqwo34rq23i34jrjasdcnl23nrlknsdf\r\n" + "Via: SIP/2.0/TCP host.example.com;rport;branch=z9hG4bK209%fzsnel234\r\n" + "CSeq: 29344 RE%47IST%45R\r\n" + "Max-Forwards: 70\r\n" + "Contact: <sip:alias1@host1.example.com>\r\n" + "C%6Fntact: <sip:alias2@host2.example.com>\r\n" + "Contact: <sip:alias3@host3.example.com>\r\n" + "l: 0\r\n" + "\r\n", + NULL, + 0, PJ_SUCCESS } }; @@ -126,7 +257,8 @@ static pj_status_t test_entry( pj_pool_t *pool, struct test_msg *entry ) char msgbuf2[PJSIP_MAX_PKT_LEN]; enum { BUFLEN = 512 }; - entry->len = pj_ansi_strlen(entry->msg); + if (entry->len==0) + entry->len = pj_ansi_strlen(entry->msg); if (var.flag & FLAG_PARSE_ONLY) goto parse_msg; @@ -180,7 +312,7 @@ parse_msg: pj_sub_timestamp(&t2, &t1); pj_add_timestamp(&var.parse_time, &t2); - if (var.flag & FLAG_PARSE_ONLY) + if ((var.flag & FLAG_PARSE_ONLY) || entry->creator==NULL) return PJ_SUCCESS; /* Create reference message. */ @@ -1734,6 +1866,11 @@ static int hdr_test(void) pj_pool_t *pool; pjsip_hdr *parsed_hdr1=NULL, *parsed_hdr2=NULL; char *input, *output; +#if defined(PJSIP_UNESCAPE_IN_PLACE) && PJSIP_UNESCAPE_IN_PLACE!=0 + static char hcontent[1024]; +#else + char *hcontent; +#endif int rc; pool = pjsip_endpt_create_pool(endpt, NULL, POOL_SIZE, POOL_SIZE); @@ -1741,8 +1878,15 @@ static int hdr_test(void) /* Parse the header */ hname = pj_str(test->hname); len = strlen(test->hcontent); +#if defined(PJSIP_UNESCAPE_IN_PLACE) && PJSIP_UNESCAPE_IN_PLACE!=0 + PJ_ASSERT_RETURN(len < sizeof(hcontent), PJSIP_EMSGTOOLONG); + strcpy(hcontent, test->hcontent); +#else + hcontent = test->hcontent; +#endif + parsed_hdr1 = (pjsip_hdr*) pjsip_parse_hdr(pool, &hname, - test->hcontent, len, + hcontent, len, &parsed_len); if (parsed_hdr1 == NULL) { if (test->flags & HDR_FLAG_PARSE_FAIL) { @@ -1765,7 +1909,14 @@ static int hdr_test(void) if (test->hshort_name) { hname = pj_str(test->hshort_name); len = strlen(test->hcontent); - parsed_hdr2 = (pjsip_hdr*) pjsip_parse_hdr(pool, &hname, test->hcontent, len, &parsed_len); +#if defined(PJSIP_UNESCAPE_IN_PLACE) && PJSIP_UNESCAPE_IN_PLACE!=0 + PJ_ASSERT_RETURN(len < sizeof(hcontent), PJSIP_EMSGTOOLONG); + strcpy(hcontent, test->hcontent); +#else + hcontent = test->hcontent; +#endif + + parsed_hdr2 = (pjsip_hdr*) pjsip_parse_hdr(pool, &hname, hcontent, len, &parsed_len); if (parsed_hdr2 == NULL) { PJ_LOG(3,(THIS_FILE, " error parsing header %s: %s", test->hshort_name, test->hcontent)); return -510; diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/regc_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/regc_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/regc_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/regc_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/test.h b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/test.h rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/test.h diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/transport_loop_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_loop_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/transport_loop_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_loop_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/transport_tcp_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_tcp_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/transport_tcp_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_tcp_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/transport_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/transport_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/transport_udp_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_udp_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/transport_udp_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/transport_udp_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/tsx_basic_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_basic_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/tsx_basic_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_basic_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/tsx_bench.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_bench.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/tsx_bench.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_bench.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/tsx_uac_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uac_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/tsx_uac_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uac_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/tsx_uas_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uas_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/tsx_uas_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/tsx_uas_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/txdata_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/txdata_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/txdata_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/txdata_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/uri_test.c b/sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/uri_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/pjsip/src/test-pjsip/uri_test.c rename to sflphone-common/libs/pjproject-1.0.2/pjsip/src/test-pjsip/uri_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/self-test.mak b/sflphone-common/libs/pjproject-1.0.2/self-test.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/self-test.mak rename to sflphone-common/libs/pjproject-1.0.2/self-test.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/svn_add b/sflphone-common/libs/pjproject-1.0.2/svn_add similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/svn_add rename to sflphone-common/libs/pjproject-1.0.2/svn_add diff --git a/sflphone-common/libs/pjproject-1.0.1/svn_pset b/sflphone-common/libs/pjproject-1.0.2/svn_pset similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/svn_pset rename to sflphone-common/libs/pjproject-1.0.2/svn_pset diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/README.TXT b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/README.TXT new file mode 100644 index 0000000000000000000000000000000000000000..69728b739fe480d7f6b9e46fcbc687a17d2aaa5e --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/README.TXT @@ -0,0 +1,59 @@ + + PJSIP CDASH AUTOMATED TESTS + -------------------------------- + + +1. What is this + + This directory contains the scripts to run the automated, Python based tests +of PJSIP source codes, across platforms, and submit the test results to a CDash +test monitoring dashboard. + + Stuffs that are included in the test scope: + - configure (for GNU platforms, e.g. Linux, msys, and MacOS X) + - build + - standard unit tests (pjlib-test, pjsip-test, etc.) + - pjsua's Python based blackbox tests + + +2. Requirements + + To run this test, you will need: + - Python (2.4 or later) + - curl (http://curl.haxx.se) + - a CDash server to receive test submissions (http://www.cdash.org) + - ccdash to submit the tests (http://trac.pjsip.org/ccdash) + + +3. Configuration + + Create a Python configuration file by copying from "cfg_site_sample.py". +Save it as "cfg_site.py". You may create more than one configurations for your +site and save them as different files. + + +4. Running + + To execute tests for GNU based targets: + + $ python main.py cfg_gnu + + + To execute tests for MSVC based target: + + $ python main.py cfg_msvc + + To execute tests for Symbian target: + + $ python main.py cfg_symbian + + + If you have a different site configuration file, you may specify it in the +arguments, e.g.: + + $ python main.py cfg_gnu my_site_config + + For more information you can also pass "-h" or "--help", e.g.: + + $ python main.py cfg_gnu --help + diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/builder.py b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/builder.py new file mode 100644 index 0000000000000000000000000000000000000000..79066e8a12ef024ead477fe9eba93cf2181701e0 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/builder.py @@ -0,0 +1,501 @@ +# +# builder.py - PJSIP test scenarios builder +# +# Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) +# +# This 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 +# + +import ccdash +import os +import platform +import re +import subprocess +import sys +import time + +class Operation: + """\ + The Operation class describes the individual ccdash operation to be + performed. + + """ + # Types: + UPDATE = "update" # Update operation + CONFIGURE = "configure" # Configure operation + BUILD = "build" # Build operation + TEST = "test" # Unit test operation + + def __init__(self, type, cmdline, name="", wdir=""): + self.type = type + self.cmdline = cmdline + self.name = name + self.wdir = wdir + if self.type==self.TEST and not self.name: + raise "name required for tests" + + def encode(self, base_dir): + s = [self.type] + if self.type == self.TEST: + s.append(self.name) + if self.type != self.UPDATE: + s.append(self.cmdline) + s.append("-w") + if self.wdir: + s.append(base_dir + "/" + self.wdir) + else: + s.append(base_dir) + return s + + +# +# Update operation +# +update_ops = [Operation(Operation.UPDATE, "")] + +# +# The standard library tests (e.g. pjlib-test, pjsip-test, etc.) +# +std_test_ops= [ + Operation(Operation.TEST, "./pjlib-test$SUFFIX", name="pjlib test", + wdir="pjlib/bin"), + Operation(Operation.TEST, "./pjlib-util-test$SUFFIX", + name="pjlib-util test", wdir="pjlib-util/bin"), + Operation(Operation.TEST, "./pjnath-test$SUFFIX", name="pjnath test", + wdir="pjnath/bin"), + Operation(Operation.TEST, "./pjmedia-test$SUFFIX", name="pjmedia test", + wdir="pjmedia/bin"), + Operation(Operation.TEST, "./pjsip-test$SUFFIX", name="pjsip test", + wdir="pjsip/bin") +] + +# +# These are pjsua Python based unit test operations +# +def build_pjsua_test_ops(pjsua_exe=""): + ops = [] + if pjsua_exe: + exe = " -e ../../pjsip-apps/bin/" + pjsua_exe + else: + exe = "" + cwd = os.getcwd() + os.chdir("../pjsua") + os.system("python runall.py --list > list") + f = open("list", "r") + for e in f: + e = e.rstrip("\r\n ") + (mod,param) = e.split(None,2) + name = mod[4:mod.find(".py")] + "_" + \ + param[param.find("/")+1:param.find(".py")] + ops.append(Operation(Operation.TEST, "python run.py" + exe + " " + \ + e, name=name, wdir="tests/pjsua")) + f.close() + os.remove("list") + os.chdir(cwd) + return ops + +# +# Get gcc version +# +def gcc_version(gcc): + proc = subprocess.Popen(gcc + " -v", stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, shell=True) + ver = "" + while True: + s = proc.stdout.readline() + if not s: + break + if s.find("gcc version") >= 0: + ver = s.split(None, 3)[2] + break + proc.wait() + return "gcc-" + ver + +# +# Get Visual Studio version +# +def vs_get_version(): + proc = subprocess.Popen("cl", stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) + while True: + s = proc.stdout.readline() + if s=="": + break + pos = s.find("Version") + if pos > 0: + proc.wait() + s = s[pos+8:] + ver = s.split(None, 1)[0] + major = ver[0:2] + if major=="12": + return "vs6" + elif major=="13": + return "vs2003" + elif major=="14": + return "vs2005" + elif major=="15": + return "vs2008" + else: + return "vs-" + major + proc.wait() + return "vs-unknown" + + +# +# Test config +# +class BaseConfig: + def __init__(self, base_dir, url, site, group, options=None): + self.base_dir = base_dir + self.url = url + self.site = site + self.group = group + self.options = options + +# +# Base class for test configurator +# +class TestBuilder: + def __init__(self, config, build_config_name="", + user_mak="", config_site="", exclude=[], not_exclude=[]): + self.config = config # BaseConfig instance + self.build_config_name = build_config_name # Optional build suffix + self.user_mak = user_mak # To be put in user.mak + self.config_site = config_site # To be put in config_s.. + self.saved_user_mak = "" # To restore user.mak + self.saved_config_site = "" # To restore config_s.. + self.exclude = exclude # List of exclude pattern + self.not_exclude = not_exclude # List of include pattern + self.ccdash_args = [] # ccdash cmd line + + def stamp(self): + return time.strftime("%Y%m%d-%H%M", time.localtime()) + + def pre_action(self): + # Override user.mak + name = self.config.base_dir + "/user.mak" + if os.access(name, os.F_OK): + f = open(name, "r") + self.saved_user_mak = f.read() + f.close() + if True: + f = open(name, "w") + f.write(self.user_mak) + f.close() + # Override config_site.h + name = self.config.base_dir + "/pjlib/include/pj/config_site.h" + if os.access(name, os.F_OK): + f = open(name, "r") + self.saved_config_site= f.read() + f.close() + if True: + f = open(name, "wt") + f.write(self.config_site) + f.close() + + + def post_action(self): + # Restore user.mak + name = self.config.base_dir + "/user.mak" + f = open(name, "wt") + f.write(self.saved_user_mak) + f.close() + # Restore config_site.h + name = self.config.base_dir + "/pjlib/include/pj/config_site.h" + f = open(name, "wt") + f.write(self.saved_config_site) + f.close() + + def build_tests(self): + # This should be overridden by subclasses + pass + + def execute(self): + if len(self.ccdash_args)==0: + self.build_tests() + self.pre_action() + mandatory_op = ["update", "configure", "build"] + counter = 0 + for a in self.ccdash_args: + # Check if this test is in exclusion list + fullcmd = " ".join(a) + excluded = False + included = False + for pat in self.exclude: + if pat and re.search(pat, fullcmd) != None: + excluded = True + break + if excluded: + for pat in self.not_exclude: + if pat and re.search(pat, fullcmd) != None: + included = True + break + if excluded and not included: + if len(fullcmd)>60: + fullcmd = fullcmd[0:60] + ".." + print "Skipping '%s'" % (fullcmd) + continue + + b = ["ccdash.py"] + b.extend(a) + a = b + #print a + try: + rc = ccdash.main(a) + except Exception, e: + errmsg = str(e) + print "**** Error: ccdash got exception %s ****" % errmsg + rc = -1 + except: + print "**** Error: ccdash got unknown exception ****" + rc = -1 + + if rc!=0 and a[1] in mandatory_op: + print "Stopping because of error.." + break + counter = counter + 1 + self.post_action() + + +# +# GNU test configurator +# +class GNUTestBuilder(TestBuilder): + """\ + This class creates list of tests suitable for GNU targets. + + """ + def __init__(self, config, build_config_name="", user_mak="", \ + config_site="", cross_compile="", exclude=[], not_exclude=[]): + """\ + Parameters: + config - BaseConfig instance + build_config_name - Optional name to be added as suffix to the build + name. Sample: "min-size", "O4", "TLS", etc. + user_mak - Contents to be put on user.mak + config_site - Contents to be put on config_site.h + cross_compile - Optional cross-compile prefix. Must include the + trailing dash, e.g. "arm-unknown-linux-" + exclude - List of regular expression patterns for tests + that will be excluded from the run + not_exclude - List of regular expression patterns for tests + that will be run regardless of whether they + match the excluded pattern. + + """ + TestBuilder.__init__(self, config, build_config_name=build_config_name, + user_mak=user_mak, config_site=config_site, + exclude=exclude, not_exclude=not_exclude) + self.cross_compile = cross_compile + if self.cross_compile and self.cross_compile[-1] != '-': + self.cross_compile.append("-") + + def build_tests(self): + if self.cross_compile: + suffix = "-" + self.cross_compile[0:-1] + build_name = self.cross_compile + \ + gcc_version(self.cross_compile + "gcc") + else: + proc = subprocess.Popen("sh "+self.config.base_dir+"/config.guess", + shell=True, stdout=subprocess.PIPE) + plat = proc.stdout.readline().rstrip(" \r\n") + build_name = plat + "-"+gcc_version(self.cross_compile + "gcc") + suffix = "-" + plat + + if self.build_config_name: + build_name = build_name + "-" + self.build_config_name + cmds = [] + cmds.extend(update_ops) + cmds.append(Operation(Operation.CONFIGURE, "sh ./configure")) + if sys.platform=="win32": + # Don't build python module on Mingw + cmds.append(Operation(Operation.BUILD, + "sh -c 'make distclean && make dep && make'")) + else: + cmds.append(Operation(Operation.BUILD, + "sh -c 'make distclean && make dep && make" + \ + " && cd pjsip-apps/src/python && " + \ + "python setup.py clean build'")) + + cmds.extend(std_test_ops) + cmds.extend(build_pjsua_test_ops()) + self.ccdash_args = [] + for c in cmds: + c.cmdline = c.cmdline.replace("$SUFFIX", suffix) + args = c.encode(self.config.base_dir) + args.extend(["-U", self.config.url, + "-S", self.config.site, + "-T", self.stamp(), + "-B", build_name, + "-G", self.config.group]) + args.extend(self.config.options) + self.ccdash_args.append(args) + +# +# MSVC test configurator +# +class MSVCTestBuilder(TestBuilder): + """\ + This class creates list of tests suitable for Visual Studio builds. + You need to set the MSVC environment variables (typically by calling + vcvars32.bat) prior to running this class. + + """ + def __init__(self, config, target="Release|Win32", build_config_name="", + config_site="", exclude=[], not_exclude=[]): + """\ + Parameters: + config - BaseConfig instance + target - Visual Studio build configuration to build. + Sample: "Debug|Win32", "Release|Win32". + build_config_name - Optional name to be added as suffix to the build + name. Sample: "Debug", "Release", "IPv6", etc. + config_site - Contents to be put on config_site.h + exclude - List of regular expression patterns for tests + that will be excluded from the run + not_exclude - List of regular expression patterns for tests + that will be run regardless of whether they + match the excluded pattern. + + """ + TestBuilder.__init__(self, config, build_config_name=build_config_name, + config_site=config_site, exclude=exclude, + not_exclude=not_exclude) + self.target = target.lower() + + def build_tests(self): + + (vsbuild,sys) = self.target.split("|",2) + + build_name = sys + "-" + vs_get_version() + "-" + vsbuild + + if self.build_config_name: + build_name = build_name + "-" + self.build_config_name + + vccmd = "vcbuild.exe /nologo /nohtmllog /nocolor /rebuild " + \ + "pjproject-vs8.sln " + " \"" + self.target + "\"" + + suffix = "-i386-win32-vc8-" + vsbuild + pjsua = "pjsua_vc8" + if vsbuild=="debug": + pjsua = pjsua + "d" + + cmds = [] + cmds.extend(update_ops) + cmds.append(Operation(Operation.CONFIGURE, "CMD /C echo Nothing to do")) + cmds.append(Operation(Operation.BUILD, vccmd)) + cmds.extend(std_test_ops) + cmds.extend(build_pjsua_test_ops(pjsua)) + + self.ccdash_args = [] + for c in cmds: + c.cmdline = c.cmdline.replace("$SUFFIX", suffix) + args = c.encode(self.config.base_dir) + args.extend(["-U", self.config.url, + "-S", self.config.site, + "-T", self.stamp(), + "-B", build_name, + "-G", self.config.group]) + args.extend(self.config.options) + self.ccdash_args.append(args) + + +# +# Symbian test configurator +# +class SymbianTestBuilder(TestBuilder): + """\ + This class creates list of tests suitable for Symbian builds. You need to + set the command line build settings prior to running this class (typically + that involves setting the EPOCROOT variable and current device). + + """ + def __init__(self, config, target="gcce urel", build_config_name="", + config_site="", exclude=[], not_exclude=[]): + """\ + Parameters: + config - BaseConfig instance + target - Symbian target to build. Default is "gcce urel". + build_config_name - Optional name to be added as suffix to the build + name. Sample: "APS", "VAS", etc. + config_site - Contents to be put on config_site.h + exclude - List of regular expression patterns for tests + that will be excluded from the run + not_exclude - List of regular expression patterns for tests + that will be run regardless of whether they + match the excluded pattern. + + """ + TestBuilder.__init__(self, config, build_config_name=build_config_name, + config_site=config_site, exclude=exclude, + not_exclude=not_exclude) + self.target = target.lower() + + def build_tests(self): + + # Check that EPOCROOT is set + if not "EPOCROOT" in os.environ: + print "Error: EPOCROOT environment variable is not set" + sys.exit(1) + epocroot = os.environ["EPOCROOT"] + # EPOCROOT must have trailing backslash + if epocroot[-1] != "\\": + epocroot = epocroot + "\\" + os.environ["EPOCROOT"] = epocroot + sdk1 = epocroot.split("\\")[-2] + + # Check that correct device is set + proc = subprocess.Popen("devices", stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, shell=True) + sdk2 = "" + while True: + line = proc.stdout.readline() + if line.find("- default") > 0: + sdk2 = line.split(":",1)[0] + break + proc.wait() + + if sdk1 != sdk2: + print "Error: default SDK in device doesn't match EPOCROOT" + print "Default device SDK =", sdk2 + print "EPOCROOT SDK =", sdk1 + sys.exit(1) + + build_name = sdk2.replace("_", "-") + "-" + \ + self.target.replace(" ", "-") + + if self.build_config_name: + build_name = build_name + "-" + self.build_config_name + + cmdline = "cmd /C \"cd build.symbian && bldmake bldfiles && abld build %s\"" % (self.target) + + cmds = [] + cmds.extend(update_ops) + cmds.append(Operation(Operation.CONFIGURE, "CMD /C echo Nothing to do")) + cmds.extend([Operation(Operation.BUILD, cmdline)]) + + self.ccdash_args = [] + suffix = "" + for c in cmds: + c.cmdline = c.cmdline.replace("$SUFFIX", suffix) + args = c.encode(self.config.base_dir) + args.extend(["-U", self.config.url, + "-S", self.config.site, + "-T", self.stamp(), + "-B", build_name, + "-G", self.config.group]) + args.extend(self.config.options) + self.ccdash_args.append(args) + diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_gnu.py b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_gnu.py new file mode 100644 index 0000000000000000000000000000000000000000..8411b654a64dac30a0762b2487d51d3ace7a2d17 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_gnu.py @@ -0,0 +1,73 @@ +# +# cfg_gnu.py - GNU target configurator +# +# Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) +# +# This 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 +# +import builder +import os +import sys + +# Each configurator must export this function +def create_builder(args): + usage = """\ +Usage: + main.py cfg_gnu [-h|--help] [cfg_site] + +Arguments: + cfg_site: site configuration module. If not specified, "cfg_site" + is implied + -h, --help Show this help screen + +""" + # (optional) args format: + # site configuration module. If not specified, "cfg_site" is implied + + cfg_site = "cfg_site" + + for arg in args: + if arg=="-h" or arg=="--help": + print usage + sys.exit(0) + elif arg[0]=="-": + print usage + sys.exit(1) + else: + cfg_site = arg + + if os.access(cfg_site+".py", os.F_OK) == False: + print "Error: file '%s.py' doesn't exist." % (cfg_site) + sys.exit(1) + + cfg_site = __import__(cfg_site) + test_cfg = builder.BaseConfig(cfg_site.BASE_DIR, \ + cfg_site.URL, \ + cfg_site.SITE_NAME, \ + cfg_site.GROUP, \ + cfg_site.OPTIONS) + + config_site = "#define PJ_TODO(x)\n" + cfg_site.CONFIG_SITE + user_mak = "export CFLAGS+=-Wall\n" + cfg_site.USER_MAK + + builders = [ + builder.GNUTestBuilder(test_cfg, build_config_name="default", + user_mak=user_mak, + config_site=config_site, + exclude=cfg_site.EXCLUDE, + not_exclude=cfg_site.NOT_EXCLUDE) + ] + + return builders diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_msvc.py b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_msvc.py new file mode 100644 index 0000000000000000000000000000000000000000..26b07855b202a0528f002e376911254d87ad4121 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_msvc.py @@ -0,0 +1,82 @@ +# +# cfg_msvc.py - MSVC/Visual Studio target configurator +# +# Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) +# +# This 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 +# +import builder +import os +import sys + +# Each configurator must export this function +def create_builder(args): + usage = """\ +Usage: + main.py cfg_msvc [-h|--help] [-t|--target TARGET] [cfg_site] + +Arguments: + cfg_site: site configuration module. If not specified, "cfg_site" + is implied + -t,--target TARGET: Visual Studio build configuration to build. Default is + "Release|Win32". Sample values: "Debug|Win32" + -h, --help Show this help screen + +""" + + cfg_site = "cfg_site" + target = "Release|Win32" + in_option = "" + + for arg in args: + if in_option=="-t": + target = arg + in_option = "" + elif arg=="--target" or arg=="-t": + in_option = "-t" + elif arg=="-h" or arg=="--help": + print usage + sys.exit(0) + elif arg[0]=="-": + print usage + sys.exit(1) + else: + cfg_site = arg + + if os.access(cfg_site+".py", os.F_OK) == False: + print "Error: file '%s.py' doesn't exist." % (cfg_site) + sys.exit(1) + + cfg_site = __import__(cfg_site) + test_cfg = builder.BaseConfig(cfg_site.BASE_DIR, \ + cfg_site.URL, \ + cfg_site.SITE_NAME, \ + cfg_site.GROUP, \ + cfg_site.OPTIONS) + + config_site = "#define PJ_TODO(x)\n" + cfg_site.CONFIG_SITE + user_mak = cfg_site.USER_MAK + + builders = [ + builder.MSVCTestBuilder(test_cfg, + target=target, + build_config_name="default", + config_site=config_site, + exclude=cfg_site.EXCLUDE, + not_exclude=cfg_site.NOT_EXCLUDE) + ] + + return builders + diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_site_sample.py b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_site_sample.py new file mode 100644 index 0000000000000000000000000000000000000000..b05964279c2a34e399377d3c5bd18185f562411c --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_site_sample.py @@ -0,0 +1,50 @@ +# +# cfg_site_sample.py - Sample site configuration +# +# Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) +# +# This 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 +# +import builder + +# Your site name +SITE_NAME="Newham3" + +# The URL where tests will be submitted to +URL = "http://192.168.0.2/dash/submit.php?project=PJSIP" + +# Test group +GROUP = "Experimental" + +# PJSIP base directory +BASE_DIR = "/root/project/pjproject" + +# List of additional ccdash options +#OPTIONS = ["-o", "out.xml", "-y"] +OPTIONS = [] + +# What's the content of config_site.h +CONFIG_SITE = "" + +# What's the content of user.mak +USER_MAK = "" + +# List of regular expression of test patterns to be excluded +EXCLUDE = [] + +# List of regular expression of test patterns to be included (even +# if they match EXCLUDE patterns) +NOT_EXCLUDE = [] +#"configure", "update", "build.*make", "build", "run.py mod_run.*100_simple"] diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_symbian.py b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_symbian.py new file mode 100644 index 0000000000000000000000000000000000000000..94f5f3f6b626fcc791077b578e50ac1f55fa5b54 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/cfg_symbian.py @@ -0,0 +1,86 @@ +# +# cfg_symbian.py - Symbian target configurator +# +# Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) +# +# This 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 +# +import builder +import os +import sys + +# Each configurator must export this function +def create_builder(args): + usage = """\ +Usage: + main.py cfg_symbian [-h|--help] [-t|--target TARGET] [cfg_site] + +Arguments: + cfg_site: site configuration module. If not specified, "cfg_site" + is implied + -t,--target TARGET: Symbian target to build. Default is "gcce urel". + Other values: + "winscw udeb", "gcce udeb", etc. + -h, --help Show this help screen +""" + + cfg_site = "cfg_site" + target = "gcce urel" + in_option = "" + + for arg in args: + if in_option=="-t": + target = arg + in_option = "" + elif arg=="--target" or arg=="-t": + in_option = "-t" + elif arg=="--help" or arg=="-h": + print usage + sys.exit(0) + elif arg[0]=="-": + print usage + sys.exit(1) + else: + cfg_site = arg + + if os.access(cfg_site+".py", os.F_OK) == False: + print "Error: file '%s.py' doesn't exist." % (cfg_site) + sys.exit(1) + + cfg_site = __import__(cfg_site) + test_cfg = builder.BaseConfig(cfg_site.BASE_DIR, \ + cfg_site.URL, \ + cfg_site.SITE_NAME, \ + cfg_site.GROUP, \ + cfg_site.OPTIONS) + config_site1 = """\ +#define PJ_TODO(x) +#include <pj/config_site_sample.h> + +""" + + config_Site = config_site1 + cfg_site.CONFIG_SITE + + builders = [ + builder.SymbianTestBuilder(test_cfg, + target=target, + build_config_name="default", + config_site=config_site1, + exclude=cfg_site.EXCLUDE, + not_exclude=cfg_site.NOT_EXCLUDE) + ] + + return builders + diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/inc_test.py b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/inc_test.py new file mode 100644 index 0000000000000000000000000000000000000000..8b137891791fe96927ad78e64b0aad7bded08bdc --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/inc_test.py @@ -0,0 +1 @@ + diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/main.py b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/main.py new file mode 100644 index 0000000000000000000000000000000000000000..8a99371455696255e816d28378f4ca63806ceb4d --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/main.py @@ -0,0 +1,42 @@ +#!/bin/env python + +# +# main.py - main entry for PJSIP's CDash tests +# +# Copyright (C) 2008-2009 Teluu Inc. (http://www.teluu.com) +# +# This 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 +# + +import sys + +if len(sys.argv)==1: + print "Usage: main.py cfg_file [cfg_site]" + print "Example:" + print " main.py cfg_gnu" + print " main.py cfg_gnu custom_cfg_site" + sys.exit(1) + + +args = [] +args.extend(sys.argv) +args.remove(args[1]) +args.remove(args[0]) + +cfg_file = __import__(sys.argv[1]) +builders = cfg_file.create_builder(args) + +for builder in builders: + builder.execute() diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/cdash/starttest_sample.bat b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/starttest_sample.bat new file mode 100644 index 0000000000000000000000000000000000000000..752e38dbe79b3d28a9fecff37487b5191b257a4d --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/cdash/starttest_sample.bat @@ -0,0 +1,44 @@ +@echo off + +rem *** +rem ************** VS 2005 ************** +rem *** +set OLD_PATH=%PATH% +set OLD_INCLUDE=%INCLUDE% +set OLD_LIB=%LIB% +set OLD_LIBPATH=%LIBPATH% + +call "C:\Program Files\Microsoft Visual Studio 8\VC\bin\vcvars32.bat" x86 +python main.py cfg_msvc -t "Debug|Win32" +python main.py cfg_msvc -t "Release|Win32" + +set PATH=%OLD_PATH% +set INCLUDE=%OLD_INCLUDE% +set LIB=%OLD_LIB% +set LIBPATH=%OLD_LIBPATH% + + +rem *** +rem ************** S60 3rd FP1 ************** +rem *** +set EPOCROOT=\symbian\9.2\S60_3rd_FP1\ +devices -setdefault @S60_3rd_FP1:com.nokia.s60 +python main.py cfg_symbian -t "winscw udeb" +python main.py cfg_symbian -t "gcce udeb" +python main.py cfg_symbian -t "gcce urel" + + +rem *** +rem ************** Mingw ************** +rem *** +set MSYSTEM=MINGW32 +set DISPLAY= +C:\msys\1.0\bin\sh -c "python main.py cfg_gnu" + + +rem *** +rem ************** Linux ************** +rem *** +set PATH=%PATH%;c:\msys\1.0\bin +set HOME=C:\msys\1.0\home\Administrator +C:\mingw\bin\ssh test@192.168.0.12 "cd project/pjproject/tests/cdash && python main.py cfg_gnu" diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/README.TXT b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/README.TXT similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/README.TXT rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/README.TXT diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/config_site.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/config_site.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/config_site.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/config_site.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/inc_cfg.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_cfg.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/inc_cfg.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_cfg.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/inc_const.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_const.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/inc_const.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_const.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/inc_sdp.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sdp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/inc_sdp.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sdp.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/inc_sip.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sip.py similarity index 98% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/inc_sip.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sip.py index 0073ba6eb3926422676bf0172c5d5fe6b374e237..03f96945e05066770fa459a5bf6f42e06115ee52 100644 --- a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/inc_sip.py +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/inc_sip.py @@ -1,4 +1,4 @@ -# $Id: inc_sip.py 2110 2008-07-07 20:14:41Z bennylp $ +# $Id: inc_sip.py 2548 2009-03-23 13:28:30Z bennylp $ # from socket import * import re @@ -91,11 +91,7 @@ class Dialog: if self.trace_enabled: print str(time.strftime("%H:%M:%S ")) + txt - def create_req(self, method, sdp, branch="", extra_headers=""): - if branch=="": - self.cseq = self.cseq + 1 - msg = req_templ - msg = msg.replace("$METHOD", method) + def update_fields(self, msg): if self.tcp: transport_param = ";transport=tcp" else: @@ -103,14 +99,23 @@ class Dialog: msg = msg.replace("$TARGET_URI", "sip:"+self.dst_addr+":"+str(self.dst_port) + transport_param) msg = msg.replace("$LOCAL_IP", self.local_ip) msg = msg.replace("$LOCAL_PORT", str(self.local_port)) - if branch=="": - branch=str(random.random()) - msg = msg.replace("$BRANCH", branch) msg = msg.replace("$FROM_TAG", self.local_tag) msg = msg.replace("$TO_TAG", self.rem_tag) msg = msg.replace("$CALL_ID", self.call_id) msg = msg.replace("$CSEQ", str(self.cseq)) + branch=str(random.random()) + msg = msg.replace("$BRANCH", branch) + return msg + + def create_req(self, method, sdp, branch="", extra_headers=""): + if branch=="": + self.cseq = self.cseq + 1 + msg = req_templ + msg = msg.replace("$METHOD", method) msg = msg.replace("$SIP_HEADERS", extra_headers) + if branch=="": + branch=str(random.random()) + msg = msg.replace("$BRANCH", branch) if sdp!="": msg = msg.replace("$CONTENT_LENGTH", str(len(sdp))) msg = msg + "Content-Type: application/sdp\r\n" @@ -118,7 +123,7 @@ class Dialog: msg = msg.replace("$CONTENT_LENGTH", "0") msg = msg + "\r\n" msg = msg + sdp - return msg + return self.update_fields(msg) def create_response(self, request, code, reason, to_tag=""): response = "SIP/2.0 " + str(code) + " " + reason + "\r\n" diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_call.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_call.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_call.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_call.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_media_playrec.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_media_playrec.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_media_playrec.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_media_playrec.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_pesq.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pesq.py similarity index 93% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_pesq.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pesq.py index be0aab245df55f41d7bc8180bfcc09dc04f45044..e2dbb60af81f6643de137c2a65c204e4597995c1 100644 --- a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_pesq.py +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pesq.py @@ -1,4 +1,4 @@ -# $Id: mod_pesq.py 2238 2008-08-26 12:15:31Z bennylp $ +# $Id: mod_pesq.py 2417 2009-01-05 15:31:25Z bennylp $ # Quality test of media calls. # - UA1 calls UA2 @@ -12,6 +12,7 @@ import time import imp +import os import sys import re import subprocess @@ -25,7 +26,7 @@ from inc_cfg import * cfg_file = imp.load_source("cfg_file", ARGS[1]) # PESQ configs -PESQ = "tools/pesq.exe" # PESQ executable path +PESQ = "tools/pesq" # PESQ executable path PESQ_DEFAULT_THRESHOLD = 3.4 # Default minimum acceptable PESQ MOS value # PESQ params @@ -123,9 +124,9 @@ def post_func(t): endpt = t.process[0] # Execute PESQ - fullcmd = PESQ + " " + pesq_sample_rate_opt + " " + input_filename + " " + output_filename + fullcmd = os.path.normpath(PESQ) + " " + pesq_sample_rate_opt + " " + input_filename + " " + output_filename endpt.trace("Popen " + fullcmd) - pesq_proc = subprocess.Popen(fullcmd, stdout=subprocess.PIPE, universal_newlines=True) + pesq_proc = subprocess.Popen(fullcmd, shell=True, stdout=subprocess.PIPE, universal_newlines=True) pesq_out = pesq_proc.communicate() # Parse ouput diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_pres.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pres.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_pres.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_pres.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_recvfrom.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_recvfrom.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_recvfrom.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_recvfrom.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_run.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_run.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_run.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_run.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_sendto.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_sendto.py similarity index 93% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_sendto.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_sendto.py index 97f0f0eb93982bf40ef0aaf8cfb3044d5867eed0..cf6038ee99d4b8d5cae36221517c16d0056211be 100644 --- a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/mod_sendto.py +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/mod_sendto.py @@ -1,4 +1,4 @@ -# $Id: mod_sendto.py 2080 2008-06-27 21:22:12Z bennylp $ +# $Id: mod_sendto.py 2548 2009-03-23 13:28:30Z bennylp $ import imp import sys import inc_sip as sip @@ -19,7 +19,7 @@ def test_func(t): cfg = cfg_file.sendto_cfg if len(cfg.complete_msg) != 0: - req = cfg.complete_msg + req = dlg.update_fields(cfg.complete_msg) else: req = dlg.create_invite(cfg.sdp, cfg.extra_headers) resp = dlg.send_request_wait(req, 10) diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/run.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/run.py similarity index 94% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/run.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/run.py index 18603e3ab9fc325261001650feb0cdf501c27056..0faef5cd2f4909088191b359d03b8e729267c754 100644 --- a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/run.py +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/run.py @@ -1,4 +1,4 @@ -# $Id: run.py 2392 2008-12-22 18:54:58Z bennylp $ +# $Id: run.py 2414 2009-01-04 20:15:37Z bennylp $ import sys import imp import re @@ -80,7 +80,7 @@ if G_EXE == "": sys.exit(1) G_INUNIX = False else: - f = open("../../../build.mak", "r") + f = open("../../build.mak", "r") while True: line = f.readline() if not line: @@ -161,7 +161,8 @@ class Expect: def wait(self): self.trace("wait") - self.proc.wait() + self.proc.communicate() + def trace(self, s): if self.trace_enabled: now = time.time() @@ -177,8 +178,20 @@ def handle_error(errmsg, t, close_processes = True): for p in t.process: p.send("q") p.send("q") - p.expect(const.DESTROYED, False) - p.wait() + is_err = False + try: + ret = p.expect(const.DESTROYED, False) + if not ret: + is_err = True + except: + is_err = True + if is_err: + if sys.hexversion >= 0x02060000: + p.proc.terminate() + else: + p.wait() + else: + p.wait() print "Test completed with error: " + errmsg sys.exit(1) diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/runall.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/runall.py similarity index 95% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/runall.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/runall.py index 4dcd0a5380a69fed54ca311a57e70158843abf15..ac9aefee969f9ffc6c987129eb7c5d75e81cd665 100644 --- a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/runall.py +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/runall.py @@ -1,4 +1,4 @@ -# $Id: runall.py 2111 2008-07-07 20:15:25Z bennylp $ +# $Id: runall.py 2398 2008-12-29 14:52:29Z bennylp $ import os import sys import time @@ -57,6 +57,12 @@ for f in os.listdir("scripts-recvfrom"): for pat in excluded_tests: tests = [t for t in tests if t.find(pat)==-1] +# List the tests only? +if len(sys.argv)==2 and sys.argv[1]=="--list": + for t in tests: + print t + sys.exit(0) + # Resume test? resume_script="" if len(sys.argv) > 1: diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/100_simplecall.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/100_simplecall.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/100_simplecall.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/100_simplecall.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_0_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_0_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_0_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_0_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_1_0.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_0.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_1_0.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_0.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_1_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_1_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_1_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_1_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_1_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_2_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_2_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_2_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/150_srtp_2_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/150_srtp_2_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/200_tcp.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/200_tcp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/200_tcp.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/200_tcp.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/300_ice_0_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_0_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/300_ice_0_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_0_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/300_ice_1_0.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_0.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/300_ice_1_0.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_0.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/300_ice_1_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/300_ice_1_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/300_ice_1_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/301_ice_public_a.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_a.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/301_ice_public_a.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_a.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/301_ice_public_b.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_b.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/301_ice_public_b.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/301_ice_public_b.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/305_ice_comp_1_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_1_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/305_ice_comp_1_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_1_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/305_ice_comp_2_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_2_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/305_ice_comp_2_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/305_ice_comp_2_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/350_prack_a.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_a.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/350_prack_a.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_a.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/350_prack_b.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_b.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-call/350_prack_b.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-call/350_prack_b.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_16.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_22.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_32.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_44.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_48.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_11_8.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_11.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_16.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_22.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_32.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_44.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-media-playrec/100_resample_lf_8_48.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/100_defaults.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/100_defaults.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/100_defaults.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/100_defaults.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/101_defaults.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/101_defaults.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/101_defaults.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/101_defaults.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_g711a.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711a.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_g711a.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711a.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_g711u.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711u.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_g711u.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g711u.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_g722.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g722.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_g722.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_g722.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_gsm.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_gsm.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_gsm.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_gsm.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_ilbc.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_ilbc.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_ilbc.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_ilbc.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_l16_16000.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_l16_16000.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_16000_stereo.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_l16_8000.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_l16_8000.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_l16_8000_stereo.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_speex_16000.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_16000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_speex_16000.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_16000.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_speex_8000.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_8000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/200_codec_speex_8000.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/200_codec_speex_8000.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_g711a.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711a.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_g711a.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711a.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_g711u.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711u.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_g711u.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g711u.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_g722.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g722.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_g722.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_g722.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_gsm.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_gsm.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_gsm.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_gsm.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_ilbc.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_ilbc.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_ilbc.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_ilbc.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_l16_16000.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_l16_16000.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_16000_stereo.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_l16_8000.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_l16_8000.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_l16_8000_stereo.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_speex_16000.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_16000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_speex_16000.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_16000.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_speex_8000.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_8000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pesq/201_codec_speex_8000.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pesq/201_codec_speex_8000.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pres/100_peertopeer.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/100_peertopeer.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pres/100_peertopeer.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/100_peertopeer.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pres/200_publish.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/200_publish.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-pres/200_publish.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-pres/200_publish.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/200_reg_good_enocredentiall.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/201_reg_good_ok.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/202_reg_good_ok_wildcard.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/205_reg_good_no_realm.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/206_reg_good_efailedcredential.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/208_reg_good_retry_nonce_ok.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/215_reg_good_multi_ok.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/220_reg_good_ims_ok.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/230_reg_bad_fail_stale_true.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/231_reg_bad_fail_stale_false_nonce_changed.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-recvfrom/234_reg_bad_stale_ok.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-run/100_simple.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/100_simple.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-run/100_simple.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/100_simple.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-run/200_register.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/200_register.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-run/200_register.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-run/200_register.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py new file mode 100644 index 0000000000000000000000000000000000000000..01ddd9a6c27b3407117522e7b0bc7f2c5362f773 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_1.py @@ -0,0 +1,52 @@ +# $Id: 001_torture_4475_3_1_1_1.py 2538 2009-03-23 13:14:26Z bennylp $ +import inc_sip as sip +import inc_sdp as sdp + +# Torture message from RFC 4475 +# 3.1.1. Valid Messages +# 3.1.1.1. A Short Tortuous INVITE +complete_msg = \ +"""INVITE sip:vivekg@chair-dnrc.example.com;unknownparam SIP/2.0 +TO : + sip:vivekg@chair-dnrc.example.com ; tag = 1918181833n +from : "J Rosenberg \\\\\\"" <sip:jdrosen@example.com> + ; + tag = 98asjd8 +MaX-fOrWaRdS: 0068 +Call-ID: wsinv.ndaksdj@192.0.2.1 +Content-Length : 150 +cseq: 0009 + INVITE +Via : SIP / 2.0 + /UDP + 192.0.2.2;rport;branch=390skdjuw +s : +NewFangledHeader: newfangled value + continued newfangled value +UnknownHeaderWithUnusualValue: ;;,,;;,; +Content-Type: application/sdp +Route: + <sip:services.example.com;lr;unknownwith=value;unknown-no-value> +v: SIP / 2.0 / TCP spindle.example.com ; + branch = z9hG4bK9ikj8 , + SIP / 2.0 / UDP 192.168.255.111 ; branch= + z9hG4bK30239 +m:"Quoted string \\"\\"" <sip:jdrosen@example.com> ; newparam = + newvalue ; + secondparam ; q = 0.33 + +v=0 +o=mhandley 29739 7272939 IN IP4 192.0.2.3 +s=- +c=IN IP4 192.0.2.4 +t=0 0 +m=audio 49217 RTP/AVP 0 12 +m=video 3227 RTP/AVP 31 +a=rtpmap:31 LPC +""" + + +sendto_cfg = sip.SendtoCfg( "RFC 4475 3.1.1.1", + "--null-audio --auto-answer 200", + "", 481, complete_msg=complete_msg) + diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py new file mode 100644 index 0000000000000000000000000000000000000000..5893093293b29bdfecfcedc482f517450d969c2d --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_2.py @@ -0,0 +1,25 @@ +# $Id: 001_torture_4475_3_1_1_2.py 2538 2009-03-23 13:14:26Z bennylp $ +import inc_sip as sip +import inc_sdp as sdp + +# Torture message from RFC 4475 +# 3.1.1. Valid Messages +# 3.1.1.2. Wide Range of Valid Characters +complete_msg = \ +"""!interesting-Method0123456789_*+`.%indeed'~ sip:1_unusual.URI~(to-be!sure)&isn't+it$/crazy?,/;;*:&it+has=1,weird!*pas$wo~d_too.(doesn't-it)@example.com SIP/2.0 +Via: SIP/2.0/UDP host1.example.com;rport;branch=z9hG4bK-.!%66*_+`'~ +To: "BEL:\\\x07 NUL:\\\x00 DEL:\\\x7F" <sip:1_unusual.URI~(to-be!sure)&isn't+it$/crazy?,/;;*@example.com> +From: token1~` token2'+_ token3*%!.- <sip:mundane@example.com> ;fromParam''~+*_!.-%="\xD1\x80\xD0\xB0\xD0\xB1\xD0\xBE\xD1\x82\xD0\xB0\xD1\x8E\xD1\x89\xD0\xB8\xD0\xB9";tag=_token~1'+`*%!-. +Call-ID: intmeth.word%ZK-!.*_+'@word`~)(><:\\/"][?}{ +CSeq: 139122385 !interesting-Method0123456789_*+`.%indeed'~ +Max-Forwards: 255 +extensionHeader-!.%*+_`'~: \xEF\xBB\xBF\xE5\xA4\xA7\xE5\x81\x9C\xE9\x9B\xBB +Content-Length: 0 + +""" + + +sendto_cfg = sip.SendtoCfg( "RFC 4475 3.1.1.2", + "--null-audio --auto-answer 200", + "", 405, complete_msg=complete_msg) + diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py new file mode 100644 index 0000000000000000000000000000000000000000..2656a14bf14d935ab7c35450554614f11003d5c3 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_3.py @@ -0,0 +1,35 @@ +# $Id: 001_torture_4475_3_1_1_3.py 2538 2009-03-23 13:14:26Z bennylp $ +import inc_sip as sip +import inc_sdp as sdp + +# Torture message from RFC 4475 +# 3.1.1. Valid Messages +# 3.1.1.3. Valid Use of the % Escaping Mechanism +complete_msg = \ +"""INVITE sip:sips%3Auser%40example.com@example.net SIP/2.0 +To: sip:%75se%72@example.com +From: <sip:I%20have%20spaces@example.net>;tag=$FROM_TAG +Max-Forwards: 87 +i: esc01.239409asdfakjkn23onasd0-3234 +CSeq: 234234 INVITE +Via: SIP/2.0/UDP host5.example.net;rport;branch=z9hG4bKkdjuw +C: application/sdp +Contact: + <sip:cal%6Cer@$LOCAL_IP:$LOCAL_PORT;%6C%72;n%61me=v%61lue%25%34%31> +Content-Length: 150 + +v=0 +o=mhandley 29739 7272939 IN IP4 192.0.2.1 +s=- +c=IN IP4 192.0.2.1 +t=0 0 +m=audio 49217 RTP/AVP 0 12 +m=video 3227 RTP/AVP 31 +a=rtpmap:31 LPC +""" + + +sendto_cfg = sip.SendtoCfg( "RFC 4475 3.1.1.3", + "--null-audio --auto-answer 200", + "", 200, complete_msg=complete_msg) + diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py new file mode 100644 index 0000000000000000000000000000000000000000..8fc28dd97b7da2ea804f8f5e47533d5974d6a785 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_4.py @@ -0,0 +1,25 @@ +# $Id: 001_torture_4475_3_1_1_4.py 2538 2009-03-23 13:14:26Z bennylp $ +import inc_sip as sip +import inc_sdp as sdp + +# Torture message from RFC 4475 +# 3.1.1. Valid Messages +# 3.1.1.4. Escaped Nulls in URIs +complete_msg = \ +"""REGISTER sip:example.com SIP/2.0 +To: sip:null-%00-null@example.com +From: sip:null-%00-null@example.com;tag=839923423 +Max-Forwards: 70 +Call-ID: escnull.39203ndfvkjdasfkq3w4otrq0adsfdfnavd +CSeq: 14398234 REGISTER +Via: SIP/2.0/UDP host5.example.com;rport;branch=z9hG4bKkdjuw +Contact: <sip:%00@host5.example.com> +Contact: <sip:%00%00@host5.example.com> +L:0 +""" + + +sendto_cfg = sip.SendtoCfg( "RFC 4475 3.1.1.4", + "--null-audio --auto-answer 200", + "", 405, complete_msg=complete_msg) + diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py new file mode 100644 index 0000000000000000000000000000000000000000..da216acbfbdac1e4f9f6668d8d4b7a7ba1055fb4 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/001_torture_4475_3_1_1_5.py @@ -0,0 +1,25 @@ +# $Id: 001_torture_4475_3_1_1_5.py 2538 2009-03-23 13:14:26Z bennylp $ +import inc_sip as sip +import inc_sdp as sdp + +# Torture message from RFC 4475 +# 3.1.1. Valid Messages +# 3.1.1.5. Use of % When It Is Not an Escape +complete_msg = \ +"""RE%47IST%45R sip:registrar.example.com SIP/2.0 +To: "%Z%45" <sip:resource@example.com> +From: "%Z%45" <sip:resource@example.com>;tag=f232jadfj23 +Call-ID: esc02.asdfnqwo34rq23i34jrjasdcnl23nrlknsdf +Via: SIP/2.0/TCP host.example.com;rport;branch=z9hG4bK209%fzsnel234 +CSeq: 29344 RE%47IST%45R +Max-Forwards: 70 +Contact: <sip:alias1@host1.example.com> +C%6Fntact: <sip:alias2@host2.example.com> +Contact: <sip:alias3@host3.example.com> +l: 0 +""" + +sendto_cfg = sip.SendtoCfg( "RFC 4475 3.1.1.5", + "--null-audio --auto-answer 200", + "", 405, complete_msg=complete_msg) + diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/100_simplecall.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/100_simplecall.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/100_simplecall.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/100_simplecall.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/110_tel_uri.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/110_tel_uri.py new file mode 100644 index 0000000000000000000000000000000000000000..e31ab2f305bfb40a1499678a8fc7d29f5dacfa9b --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/110_tel_uri.py @@ -0,0 +1,46 @@ +# $Id: 110_tel_uri.py 2536 2009-03-23 13:11:05Z bennylp $ +import inc_sip as sip +import inc_sdp as sdp + +# Handling of incoming tel: URI. +complete_msg = \ +"""INVITE tel:+2065551212 SIP/2.0 +Via: SIP/2.0/UDP $LOCAL_IP:$LOCAL_PORT;rport;x-route-tag="tgrp:cococisco1";branch=z9hG4bK61E05 +From: <tel:12345>$FROM_TAG +To: <tel:+2065551212> +Date: Thu, 12 Feb 2009 18:32:33 GMT +Call-ID: 58F8F7D6-F86A11DD-8013D591-5694EF79 +Supported: 100rel,timer,resource-priority +Min-SE: 86400 +Cisco-Guid: 1492551325-4167700957-2148586897-1452601209 +User-Agent: Cisco-SIPGateway/IOS-12.x +Allow: INVITE, OPTIONS, BYE, CANCEL, ACK, PRACK, UPDATE, REFER, SUBSCRIBE, NOTIFY, INFO, REGISTER +CSeq: 101 INVITE +Max-Forwards: 70 +Timestamp: 1234463553 +Contact: <tel:+1234;ext=1> +Contact: <sip:tester@$LOCAL_IP:$LOCAL_PORT> +Record-Route: <sip:tester@$LOCAL_IP:$LOCAL_PORT;lr> +Expires: 180 +Allow-Events: telephone-event +Content-Type: application/sdp +Content-Disposition: session;handling=required +Content-Length: 265 + +v=0 +o=CiscoSystemsSIP-GW-UserAgent 1296 9529 IN IP4 X.X.X.X +s=SIP Call +c=IN IP4 $LOCAL_IP +t=0 0 +m=audio 18676 RTP/AVP 0 101 19 +c=IN IP4 $LOCAL_IP +a=rtpmap:0 PCMU/8000 +a=rtpmap:101 telephone-event/8000 +a=fmtp:101 0-16 +a=rtpmap:19 CN/8000 +a=ptime:20 +""" + +sendto_cfg = sip.SendtoCfg( "tel: URI", "--null-audio --auto-answer 200", + "", 200, complete_msg=complete_msg) + diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/120_sdp_with_video_dynamic_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/121_sdp_with_video_static_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/122_sdp_with_unknown_dynamic_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/123_sdp_with_unknown_static_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/124_sdp_with_unknown_static_unknown_transport.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_0.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_3.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/125_sdp_with_multi_audio_4.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/150_err_extension.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/150_err_extension.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/150_err_extension.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/150_err_extension.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/151_err_sdp_video.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/151_err_sdp_video.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/151_err_sdp_video.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/151_err_sdp_video.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/152_err_sdp_no_media.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/153_err_sdp_unsupported_codec.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/155_err_sdp_bad_syntax.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/156_err_sdp_bad_net_type.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/157_err_sdp_bad_addr_type.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/158_err_sdp_bad_transport_type.py diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport.py new file mode 100644 index 0000000000000000000000000000000000000000..11a4e4d2dfb122d9baea52a2bedfc9bc6f4c871b --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport.py @@ -0,0 +1,38 @@ +# $Id: 159_no_rport.py 2534 2009-03-23 13:09:09Z bennylp $ +import inc_sip as sip +import inc_sdp as sdp + +# Ticket http://trac.pjsip.org/repos/ticket/718 +# RTC doesn't put rport in Via, and it is report to have caused segfault. +complete_msg = \ +"""INVITE sip:localhost SIP/2.0 +Via: SIP/2.0/UDP $LOCAL_IP:$LOCAL_PORT;branch=z9hG4bK74a60ee5 +From: <sip:tester@localhost>;tag=as2858a32c +To: <sip:pjsua@localhost> +Contact: <sip:tester@$LOCAL_IP:$LOCAL_PORT> +Call-ID: 123@localhost +CSeq: 1 INVITE +Max-Forwards: 70 +Content-Type: application/sdp +Content-Length: 285 + +v=0 +o=root 4236 4236 IN IP4 192.168.1.11 +s=session +c=IN IP4 192.168.1.11 +t=0 0 +m=audio 14390 RTP/AVP 0 3 8 101 +a=rtpmap:0 PCMU/8000 +a=rtpmap:3 GSM/8000 +a=rtpmap:8 PCMA/8000 +a=rtpmap:101 telephone-event/8000 +a=fmtp:101 0-16 +a=silenceSupp:off - - - - +a=ptime:20 +a=sendrecv +""" + + +sendto_cfg = sip.SendtoCfg( "RTC no rport", "--null-audio --auto-answer 200", + "", 200, complete_msg=complete_msg) + diff --git a/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport_nit.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport_nit.py new file mode 100644 index 0000000000000000000000000000000000000000..93f8ae0ec1baffd2d59e05d9d19845bda5908cf7 --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/159_no_rport_nit.py @@ -0,0 +1,25 @@ +# $Id: 159_no_rport_nit.py 2534 2009-03-23 13:09:09Z bennylp $ +import inc_sip as sip +import inc_sdp as sdp + +# Ticket http://trac.pjsip.org/repos/ticket/718 +# RTC doesn't put rport in Via, and it is reported to have caused segfault. +# +complete_msg = \ +"""MESSAGE sip:localhost SIP/2.0 +Via: SIP/2.0/UDP localhost:$LOCAL_PORT;branch=z9hG4bK$BRANCH +From: <sip:tester@localhost>;tag=as2858a32c +To: <sip:pjsua@localhost> +Call-ID: 123@localhost +CSeq: 1 MESSAGE +Max-Forwards: 70 +Content-Length: 11 +Content-Type: text/plain + +Hello world +""" + + +sendto_cfg = sip.SendtoCfg( "RTC no rport", "--null-audio --auto-answer 200", + "", 200, complete_msg=complete_msg) + diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/160_err_duplicate_replaces.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/161_err_replaces_dlg_not_found.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/200_ice_no_ice.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_no_ice.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/200_ice_no_ice.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_no_ice.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/200_ice_success_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/200_ice_success_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/200_ice_success_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/200_ice_success_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/200_ice_success_3.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_3.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/200_ice_success_3.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_3.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/200_ice_success_4.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_4.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/200_ice_success_4.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/200_ice_success_4.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/201_ice_mismatch_3.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_crypto_case_insensitive.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_duplicated_crypto_tag.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_non_numeric.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_zero.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_zero.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_zero.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_invalid_crypto_tag_zero.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/300_srtp_receive_no_key_3.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_avp.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/301_srtp0_recv_savp.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/310_srtp1_no_crypto.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/311_srtp1_recv_avp.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/312_srtp1_recv_savp.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/313_srtp1_unsupported_crypto.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp2_no_crypto.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_media_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_1.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/320_srtp_with_unknown_transport_2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/321_srtp2_recv_avp.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/322_srtp2_recv_savp.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/323_srtp2_unsupported_crypto.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/330_srtp_prefer_rtp_savp.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/331_srtp_prefer_rtp_avp.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/360_non_sip_uri.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/360_non_sip_uri.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/360_non_sip_uri.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/360_non_sip_uri.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/361_non_sip_uri.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/361_non_sip_uri.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/361_non_sip_uri.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/361_non_sip_uri.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/362_non_sip_uri.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/362_non_sip_uri.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/362_non_sip_uri.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/362_non_sip_uri.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/363_non_sip_uri_subscribe.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/364_non_sip_uri_subscribe.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/400_fmtp_g7221_with_bitrate.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_24000.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/401_fmtp_g7221_with_bitrate_32000.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/410_fmtp_amrnb_offer_octet_align.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/411_fmtp_amrnb_offer_band_eff.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/412_fmtp_amrnb_offer_band_eff2.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/500_pres_subscribe_with_bad_event.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/999_asterisk_err.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_asterisk_err.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/999_asterisk_err.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_asterisk_err.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/999_message_no_body.py b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_message_no_body.py similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sendto/999_message_no_body.py rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sendto/999_message_no_body.py diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/inv_401_retry_after_100.xml diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sipp/uas-template.xml b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/uas-template.xml similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/scripts-sipp/uas-template.xml rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/scripts-sipp/uas-template.xml diff --git a/sflphone-common/libs/pjproject-1.0.1/tests/pjsua/tools/cmp_wav.c b/sflphone-common/libs/pjproject-1.0.2/tests/pjsua/tools/cmp_wav.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/tests/pjsua/tools/cmp_wav.c rename to sflphone-common/libs/pjproject-1.0.2/tests/pjsua/tools/cmp_wav.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/README.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/README.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/Makefile b/sflphone-common/libs/pjproject-1.0.2/third_party/build/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/Makefile rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/gsm/Makefile b/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/gsm/Makefile rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/gsm/config.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/gsm/config.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/gsm/libgsmcodec.dsp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/gsm/libgsmcodec.dsp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/gsm/libgsmcodec.vcp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/gsm/libgsmcodec.vcp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/gsm/libgsmcodec.vcproj b/sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/gsm/libgsmcodec.vcproj rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/gsm/libgsmcodec.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/ilbc/Makefile b/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/ilbc/Makefile rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/ilbc/libilbccodec.dsp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/ilbc/libilbccodec.dsp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/ilbc/libilbccodec.vcp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/ilbc/libilbccodec.vcp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/ilbc/libilbccodec.vcproj b/sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/ilbc/libilbccodec.vcproj rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/ilbc/libilbccodec.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/milenage/Makefile b/sflphone-common/libs/pjproject-1.0.2/third_party/build/milenage/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/milenage/Makefile rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/milenage/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/milenage/libmilenage.dsp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/milenage/libmilenage.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/milenage/libmilenage.dsp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/milenage/libmilenage.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/milenage/libmilenage.vcp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/milenage/libmilenage.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/milenage/libmilenage.vcp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/milenage/libmilenage.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/milenage/libmilenage.vcproj b/sflphone-common/libs/pjproject-1.0.2/third_party/build/milenage/libmilenage.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/milenage/libmilenage.vcproj rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/milenage/libmilenage.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/os-auto.mak rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/os-darwinos.mak b/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-darwinos.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/os-darwinos.mak rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/os-darwinos.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/os-linux.mak b/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-linux.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/os-linux.mak rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/os-linux.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/os-win32.mak b/sflphone-common/libs/pjproject-1.0.2/third_party/build/os-win32.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/os-win32.mak rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/os-win32.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/Makefile b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/Makefile rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/libportaudio.dsp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/libportaudio.dsp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/libportaudio.vcp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/libportaudio.vcp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/libportaudio.vcproj b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/libportaudio.vcproj rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/libportaudio.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/os-auto.mak b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/os-auto.mak rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/os-auto.mak.in b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/os-auto.mak.in rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-auto.mak.in diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/os-linux.mak b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-linux.mak similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/os-linux.mak rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/os-linux.mak diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_allocation.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_allocation.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_allocation.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_allocation.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_allocation.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_converters.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_converters.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_converters.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_converters.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_converters.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_cpuload.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_cpuload.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_cpuload.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_cpuload.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_cpuload.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_debugprint.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_debugprint.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_debugprint.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_debugprint.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_debugprint.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_dither.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_dither.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_dither.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_dither.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_dither.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_endianness.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_endianness.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_endianness.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_endianness.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_front.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_front.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_front.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_front.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_hostapi.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_hostapi.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_hostapi.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_hostapi.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_linux_alsa.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_linux_alsa.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_linux_alsa.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_linux_alsa.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_linux_alsa.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_blocking.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_blocking.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_blocking.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_blocking.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_blocking.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_internal.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_internal.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_internal.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_internal.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_old.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_old.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_old.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_old.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_utilities.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_utilities.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_utilities.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_core_utilities.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_core_utilities.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_hostapis.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_hostapis.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_mac_hostapis.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_mac_hostapis.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_process.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_process.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_process.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_process.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_process.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_ringbuffer.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_ringbuffer.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_ringbuffer.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_ringbuffer.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_ringbuffer.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_skeleton.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_skeleton.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_skeleton.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_skeleton.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_stream.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_stream.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_stream.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_stream.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_stream.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_trace.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_trace.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_trace.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_trace.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_trace.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_types.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_types.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_unix_hostapis.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_hostapis.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_unix_hostapis.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_hostapis.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_unix_oss.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_oss.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_unix_oss.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_oss.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_unix_util.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_unix_util.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_unix_util.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_unix_util.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_unix_util.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_util.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_util.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_util.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_hostapis.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_hostapis.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_hostapis.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_hostapis.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_util.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_util.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_util.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_util.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_waveformat.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_waveformat.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_waveformat.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_waveformat.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_waveformat.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_wmme.c b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_wmme.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_wmme.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/pa_win_wmme.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/pa_win_wmme.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/portaudio.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/portaudio.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/portaudio/src/portaudio.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/portaudio/src/portaudio.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/Makefile b/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/Makefile rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/config.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/config.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/libresample.dsp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/libresample.dsp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/libresample.vcp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/libresample.vcp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/libresample.vcproj b/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/libresample.vcproj rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/libresample_dll.dsp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/libresample_dll.dsp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/libresample_dll.vcproj b/sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/resample/libresample_dll.vcproj rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/resample/libresample_dll.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/samplerate/README.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/samplerate/README.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/samplerate/Static.msvc b/sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/Static.msvc similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/samplerate/Static.msvc rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/Static.msvc diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/samplerate/libsamplerate_static.dsp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/libsamplerate_static.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/samplerate/libsamplerate_static.dsp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/samplerate/libsamplerate_static.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/Makefile b/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/Makefile rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/config.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/config.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/libspeex.dsp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/libspeex.dsp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/libspeex.vcp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/libspeex.vcp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/libspeex.vcproj b/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/libspeex.vcproj rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/libspeex.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/speex/speex_config_types.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/speex/speex_config_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/speex/speex/speex_config_types.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/speex/speex/speex_config_types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/srtp/Makefile b/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/srtp/Makefile rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/srtp/libsrtp.dsp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/srtp/libsrtp.dsp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/srtp/libsrtp.vcp b/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/srtp/libsrtp.vcp rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/srtp/libsrtp.vcproj b/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/srtp/libsrtp.vcproj rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/libsrtp.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/build/srtp/srtp_config.h b/sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/srtp_config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/build/srtp/srtp_config.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/build/srtp/srtp_config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/COPYRIGHT b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/COPYRIGHT similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/COPYRIGHT rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/COPYRIGHT diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/ChangeLog b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/ChangeLog similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/ChangeLog rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/ChangeLog diff --git a/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/INSTALL b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/INSTALL new file mode 100644 index 0000000000000000000000000000000000000000..5850304f8bd4085a8b25e5f7a478ea229fee20fe --- /dev/null +++ b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/INSTALL @@ -0,0 +1,99 @@ +How to get started: + + Edit the Makefile. + + You should configure a few machine-dependencies and what + compiler you want to use. + + The code works both with ANSI and K&R-C. Use + -DNeedFunctionPrototypes to compile with, or + -UNeedFunctionPrototypes to compile without, function + prototypes in the header files. + + Make addtst + + The "add" program that will be compiled and run checks whether + the basic math functions of the gsm library work with your + compiler. If it prints anything to stderr, complain (to us). + + Edit inc/config.h. + + Make + + Local versions of the gsm library and the "compress"-like filters + toast, untoast and tcat will be generated. + + If the compilation aborts because of a missing function, + declaration, or header file, see if there's something in + inc/config.h to work around it. If not, complain. + + Try it + + Grab an audio file from somewhere (raw u-law or Sun .au is fine, + linear 16-bit in host byte order will do), copy it, toast it, + untoast it, and listen to the result. + + The GSM-encoded and -decoded audio should have the quality + of a good phone line. If the resulting audio is noisier than + your original, or if you hear compression artifacts, complain; + that's a bug in our software, not a bug in the GSM encoding + standard itself. + +Installation + + You can install the gsm library interface, or the toast binaries, + or both. + + Edit the Makefile + + Fill in the directories where you want to install the + library, header files, manual pages, and binaries. + + Turn off the installation of one half of the distribution + (i.e., gsm library or toast binaries) by not setting the + corresponding directory root Makefile macro. + + make install + + will install the programs "toast" with two links named + "tcat" and "untoast", and the gsm library "libgsm.a" with + a "gsm.h" header file, and their respective manual pages. + + +Optimizing + + This code was developed on a machine without an integer + multiplication instruction, where we obtained the fastest result by + replacing some of the integer multiplications with floating point + multiplications. + + If your machine does multiply integers fast enough, + leave USE_FLOAT_MUL undefined. The results should be the + same in both cases. + + On machines with fast floating point arithmetic, defining + both USE_FLOAT_MUL and FAST makes a run-time library + option available that will (in a few crucial places) use + ``native'' floating point operations rather than the bit-by-bit + defined ones of the GSM standard. If you use this fast + option, the outcome will not be bitwise identical to the + results prescribed by the standard, but it is compatible with + the standard encoding, and a user is unlikely to notice a + difference. + + +Bug Reports + + Please direct bug reports, questions, and comments to + jutta@cs.tu-berlin.de and cabo@informatik.uni-bremen.de. + + +Good luck, + + Jutta Degener, + Carsten Bormann + +-- +Copyright 1992, 1993, 1994, by Jutta Degener and Carsten Bormann, +Technische Universitaet Berlin. See the accompanying file "COPYRIGHT" +for details. THERE IS ABSOLUTELY NO WARRANTY FOR THIS SOFTWARE. diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/MACHINES b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MACHINES similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/MACHINES rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MACHINES diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/MANIFEST b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MANIFEST similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/MANIFEST rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/MANIFEST diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/Makefile b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/Makefile rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/README b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/README similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/README rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/README diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/add-test/add_test.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/add-test/add_test.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/add-test/add_test.dta b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.dta similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/add-test/add_test.dta rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/add-test/add_test.dta diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/config.h b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/config.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/gsm.h b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/gsm.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/gsm.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/gsm.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/private.h b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/private.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/private.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/private.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/proto.h b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/proto.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/proto.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/proto.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/toast.h b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/toast.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/toast.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/toast.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/unproto.h b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/unproto.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/inc/unproto.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/inc/unproto.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/man/gsm.3 b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm.3 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/man/gsm.3 rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm.3 diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/man/gsm_explode.3 b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_explode.3 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/man/gsm_explode.3 rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_explode.3 diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/man/gsm_option.3 b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_option.3 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/man/gsm_option.3 rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_option.3 diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/man/gsm_print.3 b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_print.3 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/man/gsm_print.3 rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/man/gsm_print.3 diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/add.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/add.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/add.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/add.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/code.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/code.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/code.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/code.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/debug.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/debug.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/debug.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/debug.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/decode.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/decode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/decode.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/decode.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_create.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_create.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_create.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_create.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_decode.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_decode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_decode.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_decode.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_destroy.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_destroy.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_destroy.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_destroy.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_encode.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_encode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_encode.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_encode.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_explode.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_explode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_explode.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_explode.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_implode.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_implode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_implode.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_implode.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_option.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_option.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_option.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_option.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_print.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_print.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/gsm_print.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/gsm_print.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/long_term.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/long_term.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/long_term.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/long_term.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/lpc.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/lpc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/lpc.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/lpc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/preprocess.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/preprocess.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/preprocess.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/preprocess.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/rpe.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/rpe.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/rpe.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/rpe.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/short_term.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/short_term.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/short_term.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/short_term.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/table.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/table.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/table.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/toast.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/toast.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/toast_alaw.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_alaw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/toast_alaw.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_alaw.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/toast_audio.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_audio.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/toast_audio.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_audio.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/toast_lin.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_lin.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/toast_lin.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_lin.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/toast_ulaw.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_ulaw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/src/toast_ulaw.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/src/toast_ulaw.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/bitter.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/bitter.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/bitter.dta b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.dta similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/bitter.dta rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/bitter.dta diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/ginger.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/ginger.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/ginger.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/ginger.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/sour.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/sour.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/sour1.dta b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour1.dta similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/sour1.dta rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour1.dta diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/sour2.dta b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour2.dta similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/sour2.dta rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sour2.dta diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/sweet.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sweet.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/sweet.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/sweet.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/taste.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/taste.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/taste.h b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tls/taste.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tls/taste.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/cod2lin.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2lin.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/cod2lin.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2lin.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/cod2txt.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2txt.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/cod2txt.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/cod2txt.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/gsm2cod.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/gsm2cod.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/gsm2cod.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/gsm2cod.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/lin2cod.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2cod.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/lin2cod.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2cod.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/lin2txt.c b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2txt.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/lin2txt.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/lin2txt.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/run b/sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/run similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/gsm/tst/run rename to sflphone-common/libs/pjproject-1.0.2/third_party/gsm/tst/run diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/FrameClassify.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/FrameClassify.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/FrameClassify.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/FrameClassify.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/FrameClassify.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/LPCdecode.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/LPCdecode.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/LPCdecode.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/LPCdecode.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCdecode.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/LPCencode.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/LPCencode.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/LPCencode.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/LPCencode.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/LPCencode.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/StateConstructW.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/StateConstructW.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/StateConstructW.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/StateConstructW.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateConstructW.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/StateSearchW.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/StateSearchW.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/StateSearchW.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/StateSearchW.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/StateSearchW.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/anaFilter.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/anaFilter.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/anaFilter.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/anaFilter.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/anaFilter.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/constants.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/constants.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/constants.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/constants.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/constants.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/createCB.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/createCB.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/createCB.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/createCB.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/createCB.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/doCPLC.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/doCPLC.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/doCPLC.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/doCPLC.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/doCPLC.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/enhancer.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/enhancer.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/enhancer.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/enhancer.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/enhancer.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/filter.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/filter.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/filter.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/filter.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/filter.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/gainquant.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/gainquant.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/gainquant.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/gainquant.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/gainquant.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/getCBvec.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/getCBvec.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/getCBvec.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/getCBvec.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/getCBvec.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/helpfun.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/helpfun.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/helpfun.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/helpfun.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/helpfun.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/hpInput.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/hpInput.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/hpInput.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/hpInput.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpInput.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/hpOutput.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/hpOutput.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/hpOutput.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/hpOutput.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/hpOutput.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iCBConstruct.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iCBConstruct.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iCBConstruct.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iCBConstruct.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBConstruct.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iCBSearch.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iCBSearch.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iCBSearch.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iCBSearch.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iCBSearch.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_decode.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_decode.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_decode.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_decode.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_decode.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_define.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_define.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_define.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_define.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_encode.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_encode.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_encode.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_encode.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_encode.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_test.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_test.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/iLBC_test.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/iLBC_test.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/lsf.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/lsf.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/lsf.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/lsf.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/lsf.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/packing.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/packing.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/packing.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/packing.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/packing.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/syntFilter.c b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/syntFilter.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/syntFilter.h b/sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/ilbc/syntFilter.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/ilbc/syntFilter.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/milenage/milenage.c b/sflphone-common/libs/pjproject-1.0.2/third_party/milenage/milenage.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/milenage/milenage.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/milenage/milenage.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/milenage/milenage.h b/sflphone-common/libs/pjproject-1.0.2/third_party/milenage/milenage.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/milenage/milenage.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/milenage/milenage.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/milenage/rijndael.c b/sflphone-common/libs/pjproject-1.0.2/third_party/milenage/rijndael.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/milenage/rijndael.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/milenage/rijndael.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/milenage/rijndael.h b/sflphone-common/libs/pjproject-1.0.2/third_party/milenage/rijndael.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/milenage/rijndael.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/milenage/rijndael.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/mp3/BladeMP3EncDLL.h b/sflphone-common/libs/pjproject-1.0.2/third_party/mp3/BladeMP3EncDLL.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/mp3/BladeMP3EncDLL.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/mp3/BladeMP3EncDLL.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/mp3/mp3_port.h b/sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_port.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/mp3/mp3_port.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_port.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/mp3/mp3_writer.c b/sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_writer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/mp3/mp3_writer.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/mp3/mp3_writer.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/Doxyfile b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/Doxyfile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/Doxyfile rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/Doxyfile diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/LICENSE.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/LICENSE.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/LICENSE.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/LICENSE.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/README.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/README.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/SConstruct b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/SConstruct similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/SConstruct rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/SConstruct diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/dev-cpp/Makefile-dll b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-dll similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/dev-cpp/Makefile-dll rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-dll diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/dev-cpp/Makefile-static b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-static similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/dev-cpp/Makefile-static rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/Makefile-static diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/dev-cpp/portaudio-dll.dev b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-dll.dev similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/dev-cpp/portaudio-dll.dev rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-dll.dev diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/dev-cpp/portaudio-static.dev b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-static.dev similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/dev-cpp/portaudio-static.dev rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/portaudio-static.dev diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/dev-cpp/readme.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/readme.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/dev-cpp/readme.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/dev-cpp/readme.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/portaudio.def b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/portaudio.def rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.def diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/portaudio.dsp b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/portaudio.dsp rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/portaudio.dsw b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/portaudio.dsw rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.dsw diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/portaudio.sln b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.sln similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/portaudio.sln rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.sln diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/portaudio.vcproj b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/portaudio.vcproj rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/portaudio.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/readme.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/readme.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/msvc/readme.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/msvc/readme.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/scons/SConscript_common b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_common similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/scons/SConscript_common rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_common diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/scons/SConscript_opts b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_opts similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/build/scons/SConscript_opts rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/build/scons/SConscript_opts diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/config.guess b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.guess similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/config.guess rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.guess diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/config.sub b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.sub similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/config.sub rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/config.sub diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/configure b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/configure rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/configure.in b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/configure.in rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/configure.in diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/depcomp b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/depcomp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/depcomp rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/depcomp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/fixdir.bat b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixdir.bat similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/fixdir.bat rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixdir.bat diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/fixfile.bat b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixfile.bat similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/fixfile.bat rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/fixfile.bat diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_asio.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_asio.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_asio.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_asio.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_jack.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_jack.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_jack.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_jack.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_linux_alsa.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_linux_alsa.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_linux_alsa.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_linux_alsa.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_mac_core.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_mac_core.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_mac_core.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_mac_core.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_win_ds.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_ds.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_win_ds.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_ds.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_win_waveformat.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_waveformat.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_win_waveformat.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_waveformat.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_win_wmme.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_wmme.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/pa_win_wmme.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/pa_win_wmme.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/portaudio.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/portaudio.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/include/portaudio.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/include/portaudio.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/index.html b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/index.html similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/index.html rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/index.html diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/install-sh b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/install-sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/install-sh rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/install-sh diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/ltmain.sh b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/ltmain.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/ltmain.sh rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/ltmain.sh diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/missing b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/missing similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/missing rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/missing diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/README.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/README.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/README.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/pablio.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/pablio.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/pablio.def b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/pablio.def rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.def diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/pablio.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/pablio.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/pablio.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/test_rw.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/test_rw.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/test_rw_echo.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw_echo.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/test_rw_echo.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_rw_echo.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/test_w_saw.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/test_w_saw.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/test_w_saw8.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw8.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/pablio/test_w_saw8.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/pablio/test_w_saw8.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/portaudio-2.0.pc.in b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/portaudio-2.0.pc.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/portaudio-2.0.pc.in rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/portaudio-2.0.pc.in diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/SConscript b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/SConscript similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/SConscript rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/SConscript diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_allocation.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_allocation.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_allocation.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_allocation.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_allocation.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_converters.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_converters.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_converters.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_converters.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_converters.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_cpuload.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_cpuload.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_cpuload.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_cpuload.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_cpuload.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_debugprint.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_debugprint.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_debugprint.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_debugprint.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_debugprint.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_dither.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_dither.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_dither.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_dither.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_dither.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_endianness.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_endianness.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_endianness.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_endianness.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_front.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_front.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_front.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_front.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_hostapi.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_hostapi.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_hostapi.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_hostapi.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_memorybarrier.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_memorybarrier.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_memorybarrier.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_memorybarrier.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_process.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_process.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_process.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_process.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_process.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_ringbuffer.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_ringbuffer.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_ringbuffer.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_ringbuffer.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_ringbuffer.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_skeleton.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_skeleton.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_skeleton.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_skeleton.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_stream.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_stream.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_stream.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_stream.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_stream.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_trace.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_trace.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_trace.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_trace.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_trace.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_types.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_types.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_util.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/common/pa_util.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/common/pa_util.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/alsa/pa_linux_alsa.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asihpi/pa_linux_asihpi.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/ASIO-README.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/ASIO-README.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/ASIO-README.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/ASIO-README.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Callback_adaptation_.pdf diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/Pa_ASIO.pdf diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/iasiothiscallresolver.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/pa_asio.cpp b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/pa_asio.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/asio/pa_asio.cpp rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/asio/pa_asio.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/notes.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/notes.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/notes.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/notes.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_old.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/dsound/pa_win_ds_dynlink.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/jack/pa_jack.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/jack/pa_jack.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/jack/pa_jack.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/jack/pa_jack.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/low_latency_tip.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/pa_unix_oss.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/oss/recplay.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/recplay.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/oss/recplay.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/oss/recplay.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wasapi/pa_win_wasapi.cpp diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/pa_win_wdmks.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/wdmks/readme.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/readme.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/wdmks/readme.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wdmks/readme.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/hostapi/wmme/pa_win_wmme.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/unix/pa_unix_hostapis.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_hostapis.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/unix/pa_unix_hostapis.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_hostapis.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/unix/pa_unix_util.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/unix/pa_unix_util.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/unix/pa_unix_util.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/unix/pa_unix_util.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/unix/pa_unix_util.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_win_hostapis.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_hostapis.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_win_hostapis.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_hostapis.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_win_util.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_util.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_win_util.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_util.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_win_waveformat.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_waveformat.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_win_waveformat.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_waveformat.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_win_wdmks_utils.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_x86_plain_converters.c b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_x86_plain_converters.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_x86_plain_converters.h b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/src/os/win/pa_x86_plain_converters.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/src/os/win/pa_x86_plain_converters.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/testcvs/changeme.txt b/sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/testcvs/changeme.txt similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/portaudio/testcvs/changeme.txt rename to sflphone-common/libs/pjproject-1.0.2/third_party/portaudio/testcvs/changeme.txt diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/resample/COPYING b/sflphone-common/libs/pjproject-1.0.2/third_party/resample/COPYING similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/resample/COPYING rename to sflphone-common/libs/pjproject-1.0.2/third_party/resample/COPYING diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/resample/README.resample b/sflphone-common/libs/pjproject-1.0.2/third_party/resample/README.resample similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/resample/README.resample rename to sflphone-common/libs/pjproject-1.0.2/third_party/resample/README.resample diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/resample/include/resamplesubs.h b/sflphone-common/libs/pjproject-1.0.2/third_party/resample/include/resamplesubs.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/resample/include/resamplesubs.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/resample/include/resamplesubs.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/largefilter.h b/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/largefilter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/largefilter.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/largefilter.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/libresample_dll.c b/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/libresample_dll.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/libresample_dll.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/libresample_dll.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/resample.h b/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resample.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/resample.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resample.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/resamplesubs.c b/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resamplesubs.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/resamplesubs.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/resamplesubs.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/smallfilter.h b/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/smallfilter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/smallfilter.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/smallfilter.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/stddefs.h b/sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/stddefs.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/resample/src/stddefs.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/resample/src/stddefs.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/AUTHORS b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/AUTHORS similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/AUTHORS rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/AUTHORS diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/COPYING b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/COPYING similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/COPYING rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/COPYING diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_bits.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_bits.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_bits.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_bits.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_buffer.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_buffer.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_buffer.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_buffer.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_callbacks.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_callbacks.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_callbacks.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_callbacks.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_config_types.h.in b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_config_types.h.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_config_types.h.in rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_config_types.h.in diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_echo.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_echo.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_echo.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_echo.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_header.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_header.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_header.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_header.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_jitter.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_jitter.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_jitter.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_jitter.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_preprocess.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_preprocess.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_preprocess.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_preprocess.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_resampler.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_resampler.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_resampler.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_resampler.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_stereo.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_stereo.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_stereo.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_stereo.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_types.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/include/speex/speex_types.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/include/speex/speex_types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/_kiss_fft_guts.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/_kiss_fft_guts.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/_kiss_fft_guts.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/_kiss_fft_guts.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/arch.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/arch.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/arch.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/arch.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/bits.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/bits.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/bits.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/bits.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/buffer.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/buffer.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/buffer.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/buffer.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/cb_search.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/cb_search.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/cb_search.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/cb_search.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/cb_search_arm4.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_arm4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/cb_search_arm4.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_arm4.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/cb_search_bfin.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/cb_search_bfin.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/cb_search_sse.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_sse.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/cb_search_sse.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/cb_search_sse.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/echo_diagnostic.m b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/echo_diagnostic.m similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/echo_diagnostic.m rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/echo_diagnostic.m diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_10_16_table.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_16_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_10_16_table.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_16_table.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_10_32_table.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_32_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_10_32_table.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_10_32_table.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_20_32_table.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_20_32_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_20_32_table.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_20_32_table.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_5_256_table.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_256_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_5_256_table.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_256_table.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_5_64_table.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_64_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_5_64_table.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_5_64_table.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_8_128_table.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_8_128_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/exc_8_128_table.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/exc_8_128_table.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fftwrap.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fftwrap.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fftwrap.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fftwrap.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fftwrap.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filterbank.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filterbank.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filterbank.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filterbank.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filterbank.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filters.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filters.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filters.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filters.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filters_arm4.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_arm4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filters_arm4.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_arm4.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filters_bfin.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filters_bfin.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filters_sse.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_sse.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/filters_sse.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/filters_sse.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fixed_arm4.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fixed_arm4.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm4.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fixed_arm5e.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm5e.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fixed_arm5e.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_arm5e.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fixed_bfin.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fixed_bfin.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fixed_debug.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_debug.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fixed_debug.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_debug.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fixed_generic.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_generic.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/fixed_generic.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/fixed_generic.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/gain_table.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/gain_table.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/gain_table_lbr.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table_lbr.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/gain_table_lbr.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/gain_table_lbr.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/hexc_10_32_table.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_10_32_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/hexc_10_32_table.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_10_32_table.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/hexc_table.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_table.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/hexc_table.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/hexc_table.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/high_lsp_tables.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/high_lsp_tables.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/high_lsp_tables.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/high_lsp_tables.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/jitter.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/jitter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/jitter.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/jitter.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/kiss_fft.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/kiss_fft.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/kiss_fft.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/kiss_fft.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fft.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/kiss_fftr.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/kiss_fftr.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/kiss_fftr.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/kiss_fftr.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/kiss_fftr.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lpc.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lpc.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lpc.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lpc.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lpc_bfin.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lpc_bfin.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lpc_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lsp.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lsp.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lsp.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lsp.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lsp_bfin.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lsp_bfin.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lsp_tables_nb.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_tables_nb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/lsp_tables_nb.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/lsp_tables_nb.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/ltp.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/ltp.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/ltp.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/ltp.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/ltp_arm4.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_arm4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/ltp_arm4.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_arm4.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/ltp_bfin.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/ltp_bfin.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/ltp_sse.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_sse.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/ltp_sse.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/ltp_sse.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/math_approx.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/math_approx.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/math_approx.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/math_approx.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/mdf.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/mdf.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/mdf.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/mdf.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/misc_bfin.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/misc_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/misc_bfin.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/misc_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/modes.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/modes.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/modes.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/modes.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/modes_wb.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes_wb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/modes_wb.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/modes_wb.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/nb_celp.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/nb_celp.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/nb_celp.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/nb_celp.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/nb_celp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/os_support.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/os_support.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/os_support.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/os_support.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/preprocess.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/preprocess.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/preprocess.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/preprocess.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/pseudofloat.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/pseudofloat.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/pseudofloat.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/pseudofloat.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/quant_lsp.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/quant_lsp.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/quant_lsp.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/quant_lsp.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/quant_lsp_bfin.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/quant_lsp_bfin.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/quant_lsp_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/resample.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/resample.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/resample_sse.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample_sse.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/resample_sse.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/resample_sse.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/sb_celp.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/sb_celp.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/sb_celp.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/sb_celp.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/sb_celp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/scal.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/scal.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/scal.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/scal.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/smallft.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/smallft.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/smallft.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/smallft.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/smallft.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/speex.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/speex.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/speex_callbacks.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_callbacks.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/speex_callbacks.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_callbacks.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/speex_header.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_header.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/speex_header.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/speex_header.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/stack_alloc.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stack_alloc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/stack_alloc.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stack_alloc.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/stereo.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stereo.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/stereo.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/stereo.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testdenoise.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testdenoise.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testdenoise.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testdenoise.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testecho.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testecho.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testecho.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testecho.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testenc.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testenc.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testenc_uwb.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_uwb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testenc_uwb.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_uwb.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testenc_wb.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_wb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testenc_wb.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testenc_wb.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testjitter.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testjitter.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testjitter.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testjitter.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testresample.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testresample.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/testresample.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/testresample.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vbr.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vbr.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vbr.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vbr.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vbr.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vorbis_psy.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vorbis_psy.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vorbis_psy.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vorbis_psy.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vorbis_psy.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vq.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vq.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vq.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vq.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vq_arm4.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_arm4.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vq_arm4.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_arm4.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vq_bfin.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_bfin.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vq_bfin.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_bfin.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vq_sse.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_sse.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/vq_sse.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/vq_sse.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/window.c b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/window.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/libspeex/window.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/libspeex/window.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/symbian/config.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/symbian/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/symbian/config.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/symbian/config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/speex/win32/config.h b/sflphone-common/libs/pjproject-1.0.2/third_party/speex/win32/config.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/speex/win32/config.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/speex/win32/config.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/CHANGES b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/CHANGES similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/CHANGES rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/CHANGES diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/LICENSE b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/LICENSE similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/LICENSE rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/LICENSE diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/README b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/README similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/README rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/README diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/TODO b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/TODO similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/TODO rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/TODO diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/VERSION b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/VERSION similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/VERSION rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/VERSION diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/config.guess b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.guess similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/config.guess rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.guess diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/config.h_win32vc7 b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.h_win32vc7 similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/config.h_win32vc7 rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.h_win32vc7 diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/config.hw b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.hw similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/config.hw rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.hw diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/config.sub b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.sub similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/config.sub rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config.sub diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/config_in.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config_in.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/config_in.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/config_in.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/configure b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/configure rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/configure.in b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure.in similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/configure.in rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/configure.in diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/Makefile b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/Makefile similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/Makefile rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/Makefile diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/VERSION b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/VERSION similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/VERSION rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/VERSION diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/ae_xfm/xfm.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/ae_xfm/xfm.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/ae_xfm/xfm.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/ae_xfm/xfm.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/cipher/aes.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/cipher/aes.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/cipher/aes_cbc.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_cbc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/cipher/aes_cbc.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_cbc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/cipher/aes_icm.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_icm.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/cipher/aes_icm.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/aes_icm.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/cipher/cipher.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/cipher.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/cipher/cipher.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/cipher.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/cipher/null_cipher.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/null_cipher.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/cipher/null_cipher.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/cipher/null_cipher.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/hash/auth.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/auth.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/hash/auth.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/auth.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/hash/hmac.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/hmac.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/hash/hmac.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/hmac.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/hash/null_auth.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/null_auth.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/hash/null_auth.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/null_auth.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/hash/sha1.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/sha1.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/hash/sha1.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/hash/sha1.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/aes.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/aes.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/aes_cbc.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_cbc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/aes_cbc.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_cbc.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/aes_icm.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_icm.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/aes_icm.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/aes_icm.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/alloc.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/alloc.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/alloc.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/alloc.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/auth.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/auth.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/auth.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/cipher.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cipher.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/cipher.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cipher.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/crypto.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/crypto.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/crypto_kernel.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_kernel.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/crypto_kernel.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_kernel.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/crypto_math.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_math.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/crypto_math.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_math.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/crypto_types.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_types.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/crypto_types.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/crypto_types.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/cryptoalg.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cryptoalg.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/cryptoalg.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/cryptoalg.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/datatypes.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/datatypes.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/datatypes.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/datatypes.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/err.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/err.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/err.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/err.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/gf2_8.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/gf2_8.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/gf2_8.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/gf2_8.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/hmac.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/hmac.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/hmac.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/hmac.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/integers.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/integers.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/integers.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/integers.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/kernel_compat.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/kernel_compat.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/kernel_compat.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/kernel_compat.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/key.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/key.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/key.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/key.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/null_auth.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_auth.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/null_auth.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_auth.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/null_cipher.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_cipher.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/null_cipher.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/null_cipher.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/prng.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/prng.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/prng.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/prng.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/rand_source.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rand_source.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/rand_source.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rand_source.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/rdb.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdb.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/rdb.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdb.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/rdbx.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdbx.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/rdbx.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/rdbx.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/sha1.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/sha1.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/sha1.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/sha1.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/stat.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/stat.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/stat.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/stat.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/xfm.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/xfm.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/include/xfm.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/include/xfm.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/kernel/alloc.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/alloc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/kernel/alloc.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/alloc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/kernel/crypto_kernel.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/crypto_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/kernel/crypto_kernel.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/crypto_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/kernel/err.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/err.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/kernel/err.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/err.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/kernel/key.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/key.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/kernel/key.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/kernel/key.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/math/datatypes.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/datatypes.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/math/datatypes.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/datatypes.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/math/gf2_8.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/gf2_8.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/math/gf2_8.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/gf2_8.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/math/math.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/math.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/math/math.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/math.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/math/stat.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/stat.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/math/stat.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/math/stat.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/replay/rdb.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdb.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/replay/rdb.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdb.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/replay/rdbx.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdbx.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/replay/rdbx.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/rdbx.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/replay/ut_sim.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/ut_sim.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/replay/ut_sim.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/replay/ut_sim.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/rng/ctr_prng.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/ctr_prng.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/rng/ctr_prng.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/ctr_prng.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/rng/prng.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/prng.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/rng/prng.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/prng.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/rng/rand_linux_kernel.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_linux_kernel.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/rng/rand_linux_kernel.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_linux_kernel.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/rng/rand_source.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_source.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/rng/rand_source.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/rng/rand_source.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/aes_calc.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/aes_calc.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/aes_calc.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/aes_calc.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/auth_driver.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/auth_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/auth_driver.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/auth_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/cipher_driver.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/cipher_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/cipher_driver.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/cipher_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/datatypes_driver.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/datatypes_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/datatypes_driver.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/datatypes_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/env.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/env.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/env.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/env.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/kernel_driver.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/kernel_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/kernel_driver.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/kernel_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/rand_gen.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/rand_gen.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/rand_gen.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/rand_gen.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/sha1_driver.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/sha1_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/sha1_driver.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/sha1_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/stat_driver.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/stat_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/crypto/test/stat_driver.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/crypto/test/stat_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/getopt_s.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/getopt_s.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/getopt_s.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/getopt_s.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/rtp.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/rtp.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/rtp_priv.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp_priv.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/rtp_priv.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/rtp_priv.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/srtp.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/srtp.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/srtp_priv.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp_priv.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/srtp_priv.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/srtp_priv.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/ut_sim.h b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/ut_sim.h similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/include/ut_sim.h rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/include/ut_sim.h diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/install-sh b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/install-sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/install-sh rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/install-sh diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/pjlib/srtp_err.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/pjlib/srtp_err.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/pjlib/srtp_err.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/pjlib/srtp_err.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/srtp.def b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.def similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/srtp.def rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.def diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/srtp.vcproj b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/srtp.vcproj rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/srtp/srtp.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp/srtp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/srtp/srtp.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp/srtp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/srtp7.sln b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.sln similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/srtp7.sln rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.sln diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/srtp7.vcproj b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.vcproj similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/srtp7.vcproj rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/srtp7.vcproj diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/tables/aes_tables.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/tables/aes_tables.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/tables/aes_tables.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/tables/aes_tables.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/dtls_srtp_driver.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/dtls_srtp_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/dtls_srtp_driver.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/dtls_srtp_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/getopt_s.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/getopt_s.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/getopt_s.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/getopt_s.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/lfsr.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/lfsr.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/lfsr.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/lfsr.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/rdbx_driver.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rdbx_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/rdbx_driver.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rdbx_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/replay_driver.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/replay_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/replay_driver.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/replay_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/roc_driver.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/roc_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/roc_driver.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/roc_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/rtp.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtp.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/rtp.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtp.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/rtpw.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/rtpw.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/rtpw_test.sh b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw_test.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/rtpw_test.sh rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/rtpw_test.sh diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/srtp_driver.c b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/srtp_driver.c similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/test/srtp_driver.c rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/test/srtp_driver.c diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/timing b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/timing similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/timing rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/timing diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/undos.sh b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/undos.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/undos.sh rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/undos.sh diff --git a/sflphone-common/libs/pjproject-1.0.1/third_party/srtp/update.sh b/sflphone-common/libs/pjproject-1.0.2/third_party/srtp/update.sh similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/third_party/srtp/update.sh rename to sflphone-common/libs/pjproject-1.0.2/third_party/srtp/update.sh diff --git a/sflphone-common/libs/pjproject-1.0.1/user.mak.sample b/sflphone-common/libs/pjproject-1.0.2/user.mak.sample similarity index 100% rename from sflphone-common/libs/pjproject-1.0.1/user.mak.sample rename to sflphone-common/libs/pjproject-1.0.2/user.mak.sample diff --git a/sflphone-common/po/es.po b/sflphone-common/po/es.po index df246654f815314fd63936b6e3d4d33edd42db3d..d23b86974a3753c8e12c4590a899267c5e329c68 100644 --- a/sflphone-common/po/es.po +++ b/sflphone-common/po/es.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: SFLphone 0.9.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-21 10:45-0400\n" +"POT-Creation-Date: 2009-06-12 18:05-0400\n" "PO-Revision-Date: 2008-08-11 11:53+0200\n" "Last-Translator: Carlos Galisteo <cgalisteo AT k-rolus.net>\n" "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n" @@ -18,50 +18,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../../sflphone-client-gnome/src/accountlist.c:169 +#: ../../sflphone-client-gnome/src/accountlist.c:175 msgid "Registered" msgstr "Registrado" -#: ../../sflphone-client-gnome/src/accountlist.c:172 +#: ../../sflphone-client-gnome/src/accountlist.c:178 msgid "Not Registered" msgstr "No registrado" -#: ../../sflphone-client-gnome/src/accountlist.c:175 +#: ../../sflphone-client-gnome/src/accountlist.c:181 msgid "Trying..." msgstr "Intentando..." -#: ../../sflphone-client-gnome/src/accountlist.c:178 -#: ../../sflphone-client-gnome/src/sflnotify.c:176 -#: ../../sflphone-client-gnome/src/sflnotify.c:217 +#: ../../sflphone-client-gnome/src/accountlist.c:184 +#: ../../sflphone-client-gnome/src/sflnotify.c:131 +#: ../../sflphone-client-gnome/src/sflnotify.c:148 msgid "Error" msgstr "Error" -#: ../../sflphone-client-gnome/src/accountlist.c:181 +#: ../../sflphone-client-gnome/src/accountlist.c:187 msgid "Bad authentification" msgstr "Autenticación erronea" -#: ../../sflphone-client-gnome/src/accountlist.c:184 +#: ../../sflphone-client-gnome/src/accountlist.c:190 msgid "Network unreachable" msgstr "Red Inaccesible" -#: ../../sflphone-client-gnome/src/accountlist.c:187 +#: ../../sflphone-client-gnome/src/accountlist.c:193 msgid "Host unreachable" msgstr "_Parte del servidor" -#: ../../sflphone-client-gnome/src/accountlist.c:190 +#: ../../sflphone-client-gnome/src/accountlist.c:196 msgid "Stun configuration error" msgstr "Error de configuración Stun" -#: ../../sflphone-client-gnome/src/accountlist.c:193 +#: ../../sflphone-client-gnome/src/accountlist.c:199 msgid "Stun server invalid" msgstr "Servidor stun inválido" -#: ../../sflphone-client-gnome/src/accountlist.c:196 +#: ../../sflphone-client-gnome/src/accountlist.c:202 msgid "Invalid" msgstr "Inválido" #: ../../sflphone-client-gnome/src/actions.c:55 -#: ../../sflphone-client-gnome/src/sflnotify.c:108 +#: ../../sflphone-client-gnome/src/sflnotify.c:94 #, c-format msgid "%d voice mails" msgstr "%d mensajes de voz" @@ -80,7 +80,7 @@ msgstr "" msgid "No registered account" msgstr "No tiene ninguna cuenta registrada" -#: ../../sflphone-client-gnome/src/actions.c:229 +#: ../../sflphone-client-gnome/src/actions.c:232 msgid "" "Unable to connect to the SFLphone server.\n" "Make sure the daemon is running." @@ -88,17 +88,17 @@ msgstr "" "Incapaz de conectar con el servidor SFLphone.\n" " Asegúrese de que el demonio esté funcionando." -#: ../../sflphone-client-gnome/src/actions.c:787 +#: ../../sflphone-client-gnome/src/actions.c:807 #, c-format msgid "IP call - %s" msgstr "Llamada IP - %s" -#: ../../sflphone-client-gnome/src/actions.c:790 +#: ../../sflphone-client-gnome/src/actions.c:810 #, c-format msgid "Using %s (%s) - Codec: %s" msgstr "" -#: ../../sflphone-client-gnome/src/actions.c:880 +#: ../../sflphone-client-gnome/src/actions.c:900 #, c-format msgid "" "<b>Error: No audio codecs found.\n" @@ -130,124 +130,124 @@ msgstr "" "Server : %s\n" "Username : %s\n" -#: ../../sflphone-client-gnome/src/assistant.c:160 +#: ../../sflphone-client-gnome/src/assistant.c:159 msgid "SFLphone account configuration wizard" msgstr "Asistente de configuración de cuentas de SFLphone" -#: ../../sflphone-client-gnome/src/assistant.c:186 +#: ../../sflphone-client-gnome/src/assistant.c:185 msgid "Welcome to SFLphone!" msgstr "¡Bienvenido a SFLphone!" -#: ../../sflphone-client-gnome/src/assistant.c:187 +#: ../../sflphone-client-gnome/src/assistant.c:186 msgid "This installation wizard will help you configure an account." msgstr "Este asistente de instalación le ayudará a configurar una cuenta." -#: ../../sflphone-client-gnome/src/assistant.c:201 +#: ../../sflphone-client-gnome/src/assistant.c:200 msgid "VoIP Protocols" msgstr "Protocolos VoIP" -#: ../../sflphone-client-gnome/src/assistant.c:201 +#: ../../sflphone-client-gnome/src/assistant.c:200 msgid "Select an account type:" msgstr "Escoja un tipo de cuenta:" -#: ../../sflphone-client-gnome/src/assistant.c:219 +#: ../../sflphone-client-gnome/src/assistant.c:218 msgid "Account" msgstr "Cuenta" -#: ../../sflphone-client-gnome/src/assistant.c:219 +#: ../../sflphone-client-gnome/src/assistant.c:218 msgid "Please select one of the following option:" msgstr "Por favor, elija una de las siguientes opciones:" -#: ../../sflphone-client-gnome/src/assistant.c:221 +#: ../../sflphone-client-gnome/src/assistant.c:220 msgid "Create a free SIP/IAX2 account on sflphone.org" msgstr "Crear una cuenta SIP/IAX2 gratis en sflphone.org" -#: ../../sflphone-client-gnome/src/assistant.c:223 +#: ../../sflphone-client-gnome/src/assistant.c:222 msgid "Register an existing SIP or IAX2 account" msgstr "Registrar una cuenta SIP o IAX2 existente" -#: ../../sflphone-client-gnome/src/assistant.c:236 +#: ../../sflphone-client-gnome/src/assistant.c:235 msgid "SIP account configuration" msgstr "Configuración de cuenta SIP" -#: ../../sflphone-client-gnome/src/assistant.c:236 -#: ../../sflphone-client-gnome/src/assistant.c:332 +#: ../../sflphone-client-gnome/src/assistant.c:235 +#: ../../sflphone-client-gnome/src/assistant.c:331 msgid "Please fill the following information:" msgstr "Por favor, rellene la siguiente información:" -#: ../../sflphone-client-gnome/src/assistant.c:244 -#: ../../sflphone-client-gnome/src/assistant.c:340 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:148 +#: ../../sflphone-client-gnome/src/assistant.c:243 +#: ../../sflphone-client-gnome/src/assistant.c:339 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:153 msgid "_Alias" msgstr "_Alias" -#: ../../sflphone-client-gnome/src/assistant.c:252 -#: ../../sflphone-client-gnome/src/assistant.c:348 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:184 +#: ../../sflphone-client-gnome/src/assistant.c:251 +#: ../../sflphone-client-gnome/src/assistant.c:347 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:189 msgid "_Host name" msgstr "_Nombre de equipo" -#: ../../sflphone-client-gnome/src/assistant.c:260 -#: ../../sflphone-client-gnome/src/assistant.c:356 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:192 +#: ../../sflphone-client-gnome/src/assistant.c:259 +#: ../../sflphone-client-gnome/src/assistant.c:355 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:197 msgid "_User name" msgstr "_Usuario" -#: ../../sflphone-client-gnome/src/assistant.c:276 -#: ../../sflphone-client-gnome/src/assistant.c:371 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:207 +#: ../../sflphone-client-gnome/src/assistant.c:275 +#: ../../sflphone-client-gnome/src/assistant.c:370 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:212 msgid "_Password" msgstr "_Contraseña" -#: ../../sflphone-client-gnome/src/assistant.c:294 -#: ../../sflphone-client-gnome/src/assistant.c:387 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:223 +#: ../../sflphone-client-gnome/src/assistant.c:293 +#: ../../sflphone-client-gnome/src/assistant.c:386 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:228 msgid "_Voicemail number" msgstr "_Número de buzón de voz" -#: ../../sflphone-client-gnome/src/assistant.c:309 +#: ../../sflphone-client-gnome/src/assistant.c:308 msgid "Optional Email Address " msgstr "Dirección de correo opcional " -#: ../../sflphone-client-gnome/src/assistant.c:309 +#: ../../sflphone-client-gnome/src/assistant.c:308 msgid "This email address will be use to send your voicemail messages" msgstr "Esta dirección de correo se usará para mandar sus mensajes de voz" -#: ../../sflphone-client-gnome/src/assistant.c:317 +#: ../../sflphone-client-gnome/src/assistant.c:316 msgid "_Email" msgstr "_Correo" -#: ../../sflphone-client-gnome/src/assistant.c:332 +#: ../../sflphone-client-gnome/src/assistant.c:331 msgid "IAX2 account configuration" msgstr "Configuración de cuenta IAX2" -#: ../../sflphone-client-gnome/src/assistant.c:405 -#: ../../sflphone-client-gnome/src/config/configwindow.c:863 +#: ../../sflphone-client-gnome/src/assistant.c:404 +#: ../../sflphone-client-gnome/src/config/configwindow.c:855 msgid "Network Address Translation" msgstr "Conversión de Dirección de Red (NAT)" -#: ../../sflphone-client-gnome/src/assistant.c:405 +#: ../../sflphone-client-gnome/src/assistant.c:404 msgid "You should probably enable this if you are behind a firewall." msgstr "Probablemente tiene que activar esto si está detrás de un cortafuegos." -#: ../../sflphone-client-gnome/src/assistant.c:414 -#: ../../sflphone-client-gnome/src/config/configwindow.c:516 +#: ../../sflphone-client-gnome/src/assistant.c:413 +#: ../../sflphone-client-gnome/src/config/configwindow.c:532 msgid "E_nable STUN" msgstr "A_ctivar STUN" -#: ../../sflphone-client-gnome/src/assistant.c:421 +#: ../../sflphone-client-gnome/src/assistant.c:420 msgid "_STUN server" msgstr "_Servidor STUN" -#: ../../sflphone-client-gnome/src/assistant.c:435 +#: ../../sflphone-client-gnome/src/assistant.c:434 msgid "Account Registration" msgstr "Registro de cuenta" -#: ../../sflphone-client-gnome/src/assistant.c:435 +#: ../../sflphone-client-gnome/src/assistant.c:434 msgid "Congratulations!" msgstr "¡Enhorabuena!" -#: ../../sflphone-client-gnome/src/errors.c:28 +#: ../../sflphone-client-gnome/src/errors.c:29 msgid "" "ALSA notification\n" "\n" @@ -257,7 +257,7 @@ msgstr "" "\n" "Error al abrir el dispositivo de reproducción" -#: ../../sflphone-client-gnome/src/errors.c:31 +#: ../../sflphone-client-gnome/src/errors.c:32 msgid "" "ALSA notification\n" "\n" @@ -267,7 +267,7 @@ msgstr "" "\n" "Error al abrir el dispositivo de captura" -#: ../../sflphone-client-gnome/src/errors.c:34 +#: ../../sflphone-client-gnome/src/errors.c:35 msgid "" "Pulseaudio notification\n" "\n" @@ -306,114 +306,101 @@ msgstr "Sobre SFLphone" msgid "_Help" msgstr "_Ayuda" -#: ../../sflphone-client-gnome/src/menus.c:300 -#: ../../sflphone-client-gnome/src/menus.c:971 +#: ../../sflphone-client-gnome/src/menus.c:296 +#: ../../sflphone-client-gnome/src/menus.c:962 msgid "_New call" msgstr "_Nueva llamada" -#: ../../sflphone-client-gnome/src/menus.c:312 -#: ../../sflphone-client-gnome/src/menus.c:803 +#: ../../sflphone-client-gnome/src/menus.c:308 +#: ../../sflphone-client-gnome/src/menus.c:794 msgid "_Pick up" msgstr "_Descolgar" -#: ../../sflphone-client-gnome/src/menus.c:322 -#: ../../sflphone-client-gnome/src/menus.c:815 +#: ../../sflphone-client-gnome/src/menus.c:318 +#: ../../sflphone-client-gnome/src/menus.c:806 msgid "_Hang up" msgstr "_Colgar" -#: ../../sflphone-client-gnome/src/menus.c:332 -#: ../../sflphone-client-gnome/src/menus.c:827 +#: ../../sflphone-client-gnome/src/menus.c:328 +#: ../../sflphone-client-gnome/src/menus.c:818 msgid "On _Hold" msgstr "En _Espera" -#: ../../sflphone-client-gnome/src/menus.c:344 -#: ../../sflphone-client-gnome/src/menus.c:839 +#: ../../sflphone-client-gnome/src/menus.c:340 +#: ../../sflphone-client-gnome/src/menus.c:830 msgid "_Record" msgstr "_Recordar" -#: ../../sflphone-client-gnome/src/menus.c:358 +#: ../../sflphone-client-gnome/src/menus.c:354 msgid "_Account creation wizard" msgstr "Asistente de configuración de cuentas" -#: ../../sflphone-client-gnome/src/menus.c:388 +#: ../../sflphone-client-gnome/src/menus.c:384 msgid "_Call" msgstr "_Llamar" -#: ../../sflphone-client-gnome/src/menus.c:561 -msgid "_Clear history" +#: ../../sflphone-client-gnome/src/menus.c:552 +#, fuzzy +msgid "Clear _history" msgstr "_Limpiar historial" -#: ../../sflphone-client-gnome/src/menus.c:573 +#: ../../sflphone-client-gnome/src/menus.c:564 msgid "_Accounts" msgstr "_Cuentas" -#: ../../sflphone-client-gnome/src/menus.c:588 +#: ../../sflphone-client-gnome/src/menus.c:579 msgid "_Edit" msgstr "_Editar" -#: ../../sflphone-client-gnome/src/menus.c:649 +#: ../../sflphone-client-gnome/src/menus.c:640 msgid "_Dialpad" msgstr "_Teclado numérico" -#: ../../sflphone-client-gnome/src/menus.c:661 +#: ../../sflphone-client-gnome/src/menus.c:652 msgid "_Volume controls" msgstr "_Controles de volumen" -#: ../../sflphone-client-gnome/src/menus.c:679 +#: ../../sflphone-client-gnome/src/menus.c:670 msgid "_View" msgstr "_Ver" -#: ../../sflphone-client-gnome/src/menus.c:899 +#: ../../sflphone-client-gnome/src/menus.c:890 msgid "_Call back" msgstr "_Llamar" -#: ../../sflphone-client-gnome/src/menus.c:1082 +#: ../../sflphone-client-gnome/src/menus.c:1070 msgid "Edit phone" msgstr "Editar teléfono" -#: ../../sflphone-client-gnome/src/menus.c:1093 +#: ../../sflphone-client-gnome/src/menus.c:1081 msgid "Edit the phone number before making a call" msgstr "Editar el número de teléfono antes de llamar" -#: ../../sflphone-client-gnome/src/sflnotify.c:38 -#: ../../sflphone-client-gnome/src/sflnotify.c:105 +#: ../../sflphone-client-gnome/src/sflnotify.c:71 +#: ../../sflphone-client-gnome/src/sflnotify.c:91 #, c-format msgid "%s account: %s" msgstr "%s cuenta: %s" -#: ../../sflphone-client-gnome/src/sflnotify.c:42 +#: ../../sflphone-client-gnome/src/sflnotify.c:75 #, c-format msgid "<i>From:</i> %s" msgstr "<i>De:</i> %s" -#: ../../sflphone-client-gnome/src/sflnotify.c:57 -msgid "Accept" -msgstr "Aceptar" - -#: ../../sflphone-client-gnome/src/sflnotify.c:58 -msgid "Refuse" -msgstr "Rechazar" - -#: ../../sflphone-client-gnome/src/sflnotify.c:59 -#: ../../sflphone-client-gnome/src/sflnotify.c:122 -#: ../../sflphone-client-gnome/src/sflnotify.c:159 -msgid "Ignore" -msgstr "Ignorar" - -#: ../../sflphone-client-gnome/src/sflnotify.c:141 +#: ../../sflphone-client-gnome/src/sflnotify.c:111 #, c-format msgid "Calling with %s account <i>%s</i>" msgstr "Llamando con la cuenta %s <i>%s</i>" -#: ../../sflphone-client-gnome/src/sflnotify.c:145 +#: ../../sflphone-client-gnome/src/sflnotify.c:115 msgid "Current account" msgstr "Cuenta actual" -#: ../../sflphone-client-gnome/src/sflnotify.c:174 +#: ../../sflphone-client-gnome/src/sflnotify.c:130 msgid "You haven't setup any accounts" msgstr "No ha configurado cuentas" -#: ../../sflphone-client-gnome/src/sflnotify.c:214 +#: ../../sflphone-client-gnome/src/sflnotify.c:147 msgid "You have no registered accounts" msgstr "No tiene ninguna cuenta registrada" @@ -434,136 +421,128 @@ msgstr "Mostrar ventana principal" msgid "SFLphone - %i accounts configured" msgstr "SFLphone - %i cuentas configuradas" -#: ../../sflphone-client-gnome/src/timestamp.c:46 -msgid "<small>Missed call</small>" -msgstr "<small>Llamada fallida</small>" - -#: ../../sflphone-client-gnome/src/timestamp.c:64 -#, c-format -msgid "<small>Duration:</small> %s" -msgstr "<small>Duración:</small> %s" - #: ../../sflphone-client-gnome/src/toolbar.c:50 #, c-format msgid "\"Voicemail\" <%s>" msgstr "\"Mensaje\" <%s>" -#: ../../sflphone-client-gnome/src/toolbar.c:176 -#: ../../sflphone-client-gnome/src/toolbar.c:178 +#: ../../sflphone-client-gnome/src/toolbar.c:168 +#: ../../sflphone-client-gnome/src/toolbar.c:170 msgid "Place a call" msgstr "Llamar" -#: ../../sflphone-client-gnome/src/toolbar.c:185 -#: ../../sflphone-client-gnome/src/toolbar.c:187 +#: ../../sflphone-client-gnome/src/toolbar.c:177 +#: ../../sflphone-client-gnome/src/toolbar.c:179 msgid "Pick up" msgstr "Descolgar" -#: ../../sflphone-client-gnome/src/toolbar.c:195 -#: ../../sflphone-client-gnome/src/toolbar.c:197 +#: ../../sflphone-client-gnome/src/toolbar.c:187 +#: ../../sflphone-client-gnome/src/toolbar.c:189 msgid "Hang up" msgstr "Colgar" -#: ../../sflphone-client-gnome/src/toolbar.c:205 -#: ../../sflphone-client-gnome/src/toolbar.c:207 +#: ../../sflphone-client-gnome/src/toolbar.c:197 +#: ../../sflphone-client-gnome/src/toolbar.c:199 msgid "Off Hold" msgstr "Seguir" -#: ../../sflphone-client-gnome/src/toolbar.c:216 -#: ../../sflphone-client-gnome/src/toolbar.c:218 +#: ../../sflphone-client-gnome/src/toolbar.c:208 +#: ../../sflphone-client-gnome/src/toolbar.c:210 msgid "On Hold" msgstr "Retener" -#: ../../sflphone-client-gnome/src/toolbar.c:229 -#: ../../sflphone-client-gnome/src/toolbar.c:231 +#: ../../sflphone-client-gnome/src/toolbar.c:221 +#: ../../sflphone-client-gnome/src/toolbar.c:223 msgid "Transfer" msgstr "Transferir" -#: ../../sflphone-client-gnome/src/toolbar.c:241 -#: ../../sflphone-client-gnome/src/toolbar.c:243 +#: ../../sflphone-client-gnome/src/toolbar.c:233 +#: ../../sflphone-client-gnome/src/toolbar.c:235 msgid "History" msgstr "Historia de Llamada" -#: ../../sflphone-client-gnome/src/toolbar.c:252 -#: ../../sflphone-client-gnome/src/toolbar.c:254 +#: ../../sflphone-client-gnome/src/toolbar.c:244 +#: ../../sflphone-client-gnome/src/toolbar.c:246 msgid "Address book" msgstr "Libreta de contactos" -#: ../../sflphone-client-gnome/src/toolbar.c:260 -#: ../../sflphone-client-gnome/src/toolbar.c:264 +#: ../../sflphone-client-gnome/src/toolbar.c:252 +#: ../../sflphone-client-gnome/src/toolbar.c:256 msgid "Voicemail" msgstr "Mensaje de voz" -#: ../../sflphone-client-gnome/src/toolbar.c:272 +#: ../../sflphone-client-gnome/src/toolbar.c:264 msgid "Record a call" msgstr "Grabar una llamada" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:108 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:113 msgid "Account settings" msgstr "Configuración de cuentas" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:120 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:125 msgid "Account Parameters" msgstr "Parámetros de cuenta" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:142 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:147 msgid "_Enable this account" msgstr "_Habilitar esta cuenta" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:156 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:161 msgid "_Protocol" msgstr "_Protocolo" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:174 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:179 msgid "Unknown" msgstr "Desconocido" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:265 -#: ../../sflphone-client-gnome/src/config/configwindow.c:732 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:306 +#: ../../sflphone-client-gnome/src/config/configwindow.c:721 msgid "General" msgstr "General" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:276 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:312 msgid "_Use Evolution address books" msgstr "_Usar libreta de contactos de Evolution" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:283 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319 msgid "Download limit:" msgstr "Límite de descarga" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:294 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:327 +msgid "cards" +msgstr "" + +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333 msgid "_Display contact photo if available" msgstr "_Mostrar fotos de contactos, si está disponible" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:301 -msgid "Fields" -msgstr "Campos" - -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:311 -msgid "Use the following fields from Evolution's address books:" +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:341 +#, fuzzy +msgid "Fields from Evolution's address books" msgstr "Usar los siguientes campos de la libreta de direcciones de Evolution:" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:316 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:345 msgid "_Business phone" msgstr "_Numero de teléfono profesional" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:321 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:351 msgid "_Home phone" msgstr "_Numero de teléfono personal" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:326 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:357 msgid "_Mobile phone" msgstr "_Número de movil" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:364 msgid "Address Books" msgstr "Libreta de direcciones" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:343 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:368 msgid "Select which Evolution address books to use:" msgstr "Seleccione las libretas de direcciones de Evolution a usar:" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:377 -#: ../../sflphone-client-gnome/src/config/audioconf.c:574 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:404 +#: ../../sflphone-client-gnome/src/config/audioconf.c:576 msgid "Name" msgstr "Nombre" @@ -572,183 +551,191 @@ msgstr "Nombre" msgid "audio device index for output = %d" msgstr "índice del dispositivo de salida de audio = %d" -#: ../../sflphone-client-gnome/src/config/audioconf.c:579 +#: ../../sflphone-client-gnome/src/config/audioconf.c:581 msgid "Frequency" msgstr "Frecuencia" -#: ../../sflphone-client-gnome/src/config/audioconf.c:584 +#: ../../sflphone-client-gnome/src/config/audioconf.c:586 msgid "Bitrate" msgstr "Tasa de transferencia" -#: ../../sflphone-client-gnome/src/config/audioconf.c:589 +#: ../../sflphone-client-gnome/src/config/audioconf.c:591 msgid "Bandwidth" msgstr "Ancho de banda" -#: ../../sflphone-client-gnome/src/config/audioconf.c:652 -msgid "Pulseaudio" -msgstr "Pulseaudio" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:655 -msgid "ALSA" -msgstr "ALSA" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:681 +#: ../../sflphone-client-gnome/src/config/audioconf.c:662 msgid "ALSA plugin" msgstr "Plugin ALSA" -#: ../../sflphone-client-gnome/src/config/audioconf.c:703 +#: ../../sflphone-client-gnome/src/config/audioconf.c:684 msgid "Output" msgstr "Salida" -#: ../../sflphone-client-gnome/src/config/audioconf.c:725 +#: ../../sflphone-client-gnome/src/config/audioconf.c:706 msgid "Input" msgstr "Entrada" -#: ../../sflphone-client-gnome/src/config/audioconf.c:758 -msgid "_Enable ringtones" -msgstr "_Habilitar tonos de llamada" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:764 -msgid "Choose a ringtone" -msgstr "Elija un tono de llmada" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:769 -msgid "Audio Files" -msgstr "Archivos de Audio" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:788 +#: ../../sflphone-client-gnome/src/config/audioconf.c:741 msgid "_Voice Activity Detection" msgstr "_Detección de actividad de voz" -#: ../../sflphone-client-gnome/src/config/audioconf.c:798 +#: ../../sflphone-client-gnome/src/config/audioconf.c:751 msgid "_Noise Reduction (Narrow-Band Companding)" msgstr "_Reducción de ruido" -#: ../../sflphone-client-gnome/src/config/audioconf.c:826 +#: ../../sflphone-client-gnome/src/config/audioconf.c:780 msgid "Sound Manager" msgstr "Gestor de audio" -#: ../../sflphone-client-gnome/src/config/audioconf.c:833 +#: ../../sflphone-client-gnome/src/config/audioconf.c:783 +#, fuzzy +msgid "_Pulseaudio" +msgstr "Pulseaudio" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:788 +#, fuzzy +msgid "_ALSA" +msgstr "ALSA" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:795 msgid "ALSA configuration" msgstr "Configuración de ALSA" -#: ../../sflphone-client-gnome/src/config/audioconf.c:850 +#: ../../sflphone-client-gnome/src/config/audioconf.c:812 msgid "Codecs" msgstr "Códecs" -#: ../../sflphone-client-gnome/src/config/audioconf.c:873 +#: ../../sflphone-client-gnome/src/config/audioconf.c:835 msgid "Ringtones" msgstr "Tonos de llamada" -#: ../../sflphone-client-gnome/src/config/configwindow.c:402 +#: ../../sflphone-client-gnome/src/config/audioconf.c:841 +msgid "_Enable ringtones" +msgstr "_Habilitar tonos de llamada" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:847 +msgid "Choose a ringtone" +msgstr "Elija un tono de llmada" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:853 +msgid "Audio Files" +msgstr "Archivos de Audio" + +#: ../../sflphone-client-gnome/src/config/configwindow.c:418 msgid "Protocol" msgstr "Protocolo" -#: ../../sflphone-client-gnome/src/config/configwindow.c:409 +#: ../../sflphone-client-gnome/src/config/configwindow.c:425 msgid "Status" msgstr "Estado" -#: ../../sflphone-client-gnome/src/config/configwindow.c:512 +#: ../../sflphone-client-gnome/src/config/configwindow.c:528 msgid "Stun parameters will apply to each SIP account created." msgstr "Parámetros de stun se aplicarán a cada cuenta SIP creada." -#: ../../sflphone-client-gnome/src/config/configwindow.c:520 +#: ../../sflphone-client-gnome/src/config/configwindow.c:536 msgid "Enable it if you are behind a firewall" msgstr "Actívelo si está detrás de un cortafuegos" -#: ../../sflphone-client-gnome/src/config/configwindow.c:528 +#: ../../sflphone-client-gnome/src/config/configwindow.c:544 msgid "Format: name.server:port" msgstr "Formato: nombre.servidor:puerto" -#: ../../sflphone-client-gnome/src/config/configwindow.c:579 +#: ../../sflphone-client-gnome/src/config/configwindow.c:589 msgid "Desktop Notifications" msgstr "Notificación de escritorio" -#: ../../sflphone-client-gnome/src/config/configwindow.c:588 +#: ../../sflphone-client-gnome/src/config/configwindow.c:593 msgid "_Enable notifications" msgstr "_Habilitar notificaciones" -#: ../../sflphone-client-gnome/src/config/configwindow.c:594 +#: ../../sflphone-client-gnome/src/config/configwindow.c:599 msgid "Enable voicemail _notifications" msgstr "Habilitar _notificaciones de mensajes de voz" -#: ../../sflphone-client-gnome/src/config/configwindow.c:605 +#: ../../sflphone-client-gnome/src/config/configwindow.c:611 msgid "System Tray Icon" msgstr "Icono de bandeja del sistema" -#: ../../sflphone-client-gnome/src/config/configwindow.c:613 +#: ../../sflphone-client-gnome/src/config/configwindow.c:614 msgid "_Popup main window on incoming call" msgstr "_Popup ventana principal al recibir llamadas" -#: ../../sflphone-client-gnome/src/config/configwindow.c:618 +#: ../../sflphone-client-gnome/src/config/configwindow.c:619 msgid "Ne_ver popup main window" msgstr "_Nunca mostrar ventana principal" -#: ../../sflphone-client-gnome/src/config/configwindow.c:622 +#: ../../sflphone-client-gnome/src/config/configwindow.c:623 msgid "Hide SFLphone window on _startup" msgstr "Esconder SFLphone en el arranque" -#: ../../sflphone-client-gnome/src/config/configwindow.c:628 +#: ../../sflphone-client-gnome/src/config/configwindow.c:629 msgid "Calls History" msgstr "Historial de llamadas" -#: ../../sflphone-client-gnome/src/config/configwindow.c:636 -msgid "_History size limit" -msgstr "Límite de tamaño de _historial" +#: ../../sflphone-client-gnome/src/config/configwindow.c:632 +msgid "_Keep my history for at least" +msgstr "" + +#: ../../sflphone-client-gnome/src/config/configwindow.c:643 +msgid " days" +msgstr "" -#: ../../sflphone-client-gnome/src/config/configwindow.c:653 +#: ../../sflphone-client-gnome/src/config/configwindow.c:647 msgid "PulseAudio sound server" msgstr "Servidor de sonido Pulseaudio" -#: ../../sflphone-client-gnome/src/config/configwindow.c:661 -msgid "Mute other applications during a _call" +#: ../../sflphone-client-gnome/src/config/configwindow.c:650 +#, fuzzy +msgid "_Mute other applications during a call" msgstr "Silenciar el resto de aplicaciones durante una llamada" -#: ../../sflphone-client-gnome/src/config/configwindow.c:674 +#: ../../sflphone-client-gnome/src/config/configwindow.c:664 msgid "SIP Port" msgstr "Puerto SIP" -#: ../../sflphone-client-gnome/src/config/configwindow.c:687 +#: ../../sflphone-client-gnome/src/config/configwindow.c:677 msgid "Port:" msgstr "Puerto:" -#: ../../sflphone-client-gnome/src/config/configwindow.c:742 -msgid "_Recordings folder" +#: ../../sflphone-client-gnome/src/config/configwindow.c:725 +#, fuzzy +msgid "Recordings folder" msgstr "Directorio de Grabaciones" -#: ../../sflphone-client-gnome/src/config/configwindow.c:748 +#: ../../sflphone-client-gnome/src/config/configwindow.c:731 msgid "Select a folder" msgstr "Seleccione un directorio" -#: ../../sflphone-client-gnome/src/config/configwindow.c:773 +#: ../../sflphone-client-gnome/src/config/configwindow.c:765 msgid "Preferences" msgstr "Preferencias" -#: ../../sflphone-client-gnome/src/config/configwindow.c:793 +#: ../../sflphone-client-gnome/src/config/configwindow.c:785 msgid "General Settings" msgstr "Configuración general" -#: ../../sflphone-client-gnome/src/config/configwindow.c:798 +#: ../../sflphone-client-gnome/src/config/configwindow.c:790 msgid "Audio Settings" msgstr "Configuración de audio" -#: ../../sflphone-client-gnome/src/config/configwindow.c:803 +#: ../../sflphone-client-gnome/src/config/configwindow.c:795 msgid "Recordings" msgstr "Grabaciones" -#: ../../sflphone-client-gnome/src/config/configwindow.c:808 +#: ../../sflphone-client-gnome/src/config/configwindow.c:800 msgid "Address Book" msgstr "Libreta de direcciones" -#: ../../sflphone-client-gnome/src/config/configwindow.c:813 +#: ../../sflphone-client-gnome/src/config/configwindow.c:805 msgid "Hooks" msgstr "Disparadores" -#: ../../sflphone-client-gnome/src/config/configwindow.c:840 +#: ../../sflphone-client-gnome/src/config/configwindow.c:832 msgid "Accounts" msgstr "Cuentas" -#: ../../sflphone-client-gnome/src/config/configwindow.c:852 +#: ../../sflphone-client-gnome/src/config/configwindow.c:844 msgid "Configured Accounts" msgstr "Cuentas Configuradas" @@ -756,46 +743,95 @@ msgstr "Cuentas Configuradas" msgid "URL Passing" msgstr "Paso de URL" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:140 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:135 +msgid "Custom commands on incoming calls with URL," +msgstr "" + +#: ../../sflphone-client-gnome/src/config/hooks-config.c:138 #, c-format -msgid "" -"SFLphone can run custom commands if incoming calls come with an URL " -"attached.\n" -"In this case, %s will be replaced with the passed URL." +msgid "%s will be replaced with the passed URL." msgstr "" -"SFLphone puede ejecutar órdenes personalizadas si las llamadas entrantes " -"incluyen una URL.\n" -"En este caso, %s se remplazará por la URL." -#: ../../sflphone-client-gnome/src/config/hooks-config.c:143 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:141 msgid "Trigger on specific _SIP header" msgstr "Evento desencadenado con una cabecera _SIP específica" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:155 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:150 msgid "Trigger on _IAX2 URL" msgstr "Evento desencadenado con una URL _IAX2" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:160 -msgid "_Command to run: " +#: ../../sflphone-client-gnome/src/config/hooks-config.c:155 +#, fuzzy +msgid "Command to _run: " msgstr "_Orden a ejecutar: " -#: ../../sflphone-client-gnome/src/config/hooks-config.c:168 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:165 msgid "Phone Number Rewriting" msgstr "Reescritura de número de teléfono" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:178 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:169 msgid "_Prefix dialed numbers with:" msgstr "_prefijar los números marcados con:" -#: ../../sflphone-client-gnome/src/contacts/history.c:83 -#: ../../sflphone-client-gnome/src/contacts/searchbar.c:123 -msgid "Search history" -msgstr "Historial de búsquedas" +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:55 +msgid "" +"Search all\n" +"Click here to change the search type" +msgstr "" + +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:67 +msgid "" +"Search by missed call\n" +"Click here to change the search type" +msgstr "" + +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:79 +msgid "" +"Search by incoming call\n" +"Click here to change the search type" +msgstr "" + +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:91 +msgid "" +"Search by outgoing call\n" +"Click here to change the search type" +msgstr "" + +#~ msgid "Accept" +#~ msgstr "Aceptar" + +#~ msgid "Refuse" +#~ msgstr "Rechazar" + +#~ msgid "Ignore" +#~ msgstr "Ignorar" + +#~ msgid "<small>Missed call</small>" +#~ msgstr "<small>Llamada fallida</small>" + +#~ msgid "<small>Duration:</small> %s" +#~ msgstr "<small>Duración:</small> %s" + +#~ msgid "Fields" +#~ msgstr "Campos" + +#~ msgid "_History size limit" +#~ msgstr "Límite de tamaño de _historial" + +#~ msgid "" +#~ "SFLphone can run custom commands if incoming calls come with an URL " +#~ "attached.\n" +#~ "In this case, %s will be replaced with the passed URL." +#~ msgstr "" +#~ "SFLphone puede ejecutar órdenes personalizadas si las llamadas entrantes " +#~ "incluyen una URL.\n" +#~ "En este caso, %s se remplazará por la URL." + +#~ msgid "Search history" +#~ msgstr "Historial de búsquedas" -#: ../../sflphone-client-gnome/src/contacts/history.c:83 -#: ../../sflphone-client-gnome/src/contacts/searchbar.c:110 -msgid "Search contact" -msgstr "_Buscar contacto" +#~ msgid "Search contact" +#~ msgstr "_Buscar contacto" #~ msgid "Registered to %s (%s)" #~ msgstr "Registrado en %s (%s)" diff --git a/sflphone-common/po/zh_CN.po b/sflphone-common/po/zh_CN.po index 7de05fd789dc5291fc8b58039702ca8ef61aa695..0347cfcfed711a7e67e8a9718e8b1214b64fb0d0 100644 --- a/sflphone-common/po/zh_CN.po +++ b/sflphone-common/po/zh_CN.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: SFLphone 0.9.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-21 10:45-0400\n" +"POT-Creation-Date: 2009-06-12 18:05-0400\n" "PO-Revision-Date: 2008-10-28 14:15\n" "Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n" "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n" @@ -17,50 +17,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../../sflphone-client-gnome/src/accountlist.c:169 +#: ../../sflphone-client-gnome/src/accountlist.c:175 msgid "Registered" msgstr "已注册" -#: ../../sflphone-client-gnome/src/accountlist.c:172 +#: ../../sflphone-client-gnome/src/accountlist.c:178 msgid "Not Registered" msgstr "未注册" -#: ../../sflphone-client-gnome/src/accountlist.c:175 +#: ../../sflphone-client-gnome/src/accountlist.c:181 msgid "Trying..." msgstr "正在连接..." -#: ../../sflphone-client-gnome/src/accountlist.c:178 -#: ../../sflphone-client-gnome/src/sflnotify.c:176 -#: ../../sflphone-client-gnome/src/sflnotify.c:217 +#: ../../sflphone-client-gnome/src/accountlist.c:184 +#: ../../sflphone-client-gnome/src/sflnotify.c:131 +#: ../../sflphone-client-gnome/src/sflnotify.c:148 msgid "Error" msgstr "注册失败" -#: ../../sflphone-client-gnome/src/accountlist.c:181 +#: ../../sflphone-client-gnome/src/accountlist.c:187 msgid "Bad authentification" msgstr "认证错误" -#: ../../sflphone-client-gnome/src/accountlist.c:184 +#: ../../sflphone-client-gnome/src/accountlist.c:190 msgid "Network unreachable" msgstr "网络连接失败" -#: ../../sflphone-client-gnome/src/accountlist.c:187 +#: ../../sflphone-client-gnome/src/accountlist.c:193 msgid "Host unreachable" msgstr "服务器连接失败" -#: ../../sflphone-client-gnome/src/accountlist.c:190 +#: ../../sflphone-client-gnome/src/accountlist.c:196 msgid "Stun configuration error" msgstr "Stun配置有误" -#: ../../sflphone-client-gnome/src/accountlist.c:193 +#: ../../sflphone-client-gnome/src/accountlist.c:199 msgid "Stun server invalid" msgstr "Stun服务器无效" -#: ../../sflphone-client-gnome/src/accountlist.c:196 +#: ../../sflphone-client-gnome/src/accountlist.c:202 msgid "Invalid" msgstr "无效" #: ../../sflphone-client-gnome/src/actions.c:55 -#: ../../sflphone-client-gnome/src/sflnotify.c:108 +#: ../../sflphone-client-gnome/src/sflnotify.c:94 #, c-format msgid "%d voice mails" msgstr "%d 个语音信息" @@ -79,7 +79,7 @@ msgstr "" msgid "No registered account" msgstr "未发现已注册帐户" -#: ../../sflphone-client-gnome/src/actions.c:229 +#: ../../sflphone-client-gnome/src/actions.c:232 msgid "" "Unable to connect to the SFLphone server.\n" "Make sure the daemon is running." @@ -87,17 +87,17 @@ msgstr "" "连接SFLphone服务器失败.\n" "请检查daemon是否还在运行." -#: ../../sflphone-client-gnome/src/actions.c:787 +#: ../../sflphone-client-gnome/src/actions.c:807 #, c-format msgid "IP call - %s" msgstr "IP 电话 - %s" -#: ../../sflphone-client-gnome/src/actions.c:790 +#: ../../sflphone-client-gnome/src/actions.c:810 #, c-format msgid "Using %s (%s) - Codec: %s" msgstr "" -#: ../../sflphone-client-gnome/src/actions.c:880 +#: ../../sflphone-client-gnome/src/actions.c:900 #, c-format msgid "" "<b>Error: No audio codecs found.\n" @@ -128,124 +128,124 @@ msgstr "" "服务器: %s\n" "用户名: %s\n" -#: ../../sflphone-client-gnome/src/assistant.c:160 +#: ../../sflphone-client-gnome/src/assistant.c:159 msgid "SFLphone account configuration wizard" msgstr "SFLphone 帐户设置向导" -#: ../../sflphone-client-gnome/src/assistant.c:186 +#: ../../sflphone-client-gnome/src/assistant.c:185 msgid "Welcome to SFLphone!" msgstr "欢迎使用SFLphone!" -#: ../../sflphone-client-gnome/src/assistant.c:187 +#: ../../sflphone-client-gnome/src/assistant.c:186 msgid "This installation wizard will help you configure an account." msgstr "安装向导将帮助您配置帐户" -#: ../../sflphone-client-gnome/src/assistant.c:201 +#: ../../sflphone-client-gnome/src/assistant.c:200 msgid "VoIP Protocols" msgstr "VoIP协议" -#: ../../sflphone-client-gnome/src/assistant.c:201 +#: ../../sflphone-client-gnome/src/assistant.c:200 msgid "Select an account type:" msgstr "选择帐户类型:" -#: ../../sflphone-client-gnome/src/assistant.c:219 +#: ../../sflphone-client-gnome/src/assistant.c:218 msgid "Account" msgstr "帐户" -#: ../../sflphone-client-gnome/src/assistant.c:219 +#: ../../sflphone-client-gnome/src/assistant.c:218 msgid "Please select one of the following option:" msgstr "请选择以下选项中的一个:" -#: ../../sflphone-client-gnome/src/assistant.c:221 +#: ../../sflphone-client-gnome/src/assistant.c:220 msgid "Create a free SIP/IAX2 account on sflphone.org" msgstr "在sflphone.org上创建免费的SIP/IAX2帐户" -#: ../../sflphone-client-gnome/src/assistant.c:223 +#: ../../sflphone-client-gnome/src/assistant.c:222 msgid "Register an existing SIP or IAX2 account" msgstr "注册已存在的SIP或IAX2帐户" -#: ../../sflphone-client-gnome/src/assistant.c:236 +#: ../../sflphone-client-gnome/src/assistant.c:235 msgid "SIP account configuration" msgstr "SIP帐户配置" -#: ../../sflphone-client-gnome/src/assistant.c:236 -#: ../../sflphone-client-gnome/src/assistant.c:332 +#: ../../sflphone-client-gnome/src/assistant.c:235 +#: ../../sflphone-client-gnome/src/assistant.c:331 msgid "Please fill the following information:" msgstr "请填写以下信息:" -#: ../../sflphone-client-gnome/src/assistant.c:244 -#: ../../sflphone-client-gnome/src/assistant.c:340 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:148 +#: ../../sflphone-client-gnome/src/assistant.c:243 +#: ../../sflphone-client-gnome/src/assistant.c:339 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:153 msgid "_Alias" msgstr "别名(A)" -#: ../../sflphone-client-gnome/src/assistant.c:252 -#: ../../sflphone-client-gnome/src/assistant.c:348 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:184 +#: ../../sflphone-client-gnome/src/assistant.c:251 +#: ../../sflphone-client-gnome/src/assistant.c:347 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:189 msgid "_Host name" msgstr "主机名(H)" -#: ../../sflphone-client-gnome/src/assistant.c:260 -#: ../../sflphone-client-gnome/src/assistant.c:356 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:192 +#: ../../sflphone-client-gnome/src/assistant.c:259 +#: ../../sflphone-client-gnome/src/assistant.c:355 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:197 msgid "_User name" msgstr "用户名(U)" -#: ../../sflphone-client-gnome/src/assistant.c:276 -#: ../../sflphone-client-gnome/src/assistant.c:371 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:207 +#: ../../sflphone-client-gnome/src/assistant.c:275 +#: ../../sflphone-client-gnome/src/assistant.c:370 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:212 msgid "_Password" msgstr "密码(P)" -#: ../../sflphone-client-gnome/src/assistant.c:294 -#: ../../sflphone-client-gnome/src/assistant.c:387 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:223 +#: ../../sflphone-client-gnome/src/assistant.c:293 +#: ../../sflphone-client-gnome/src/assistant.c:386 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:228 msgid "_Voicemail number" msgstr "语音信箱号码(V)" -#: ../../sflphone-client-gnome/src/assistant.c:309 +#: ../../sflphone-client-gnome/src/assistant.c:308 msgid "Optional Email Address " msgstr "可选邮件地址 " -#: ../../sflphone-client-gnome/src/assistant.c:309 +#: ../../sflphone-client-gnome/src/assistant.c:308 msgid "This email address will be use to send your voicemail messages" msgstr "这个邮件地址将被用来发送您的语音邮箱消息" -#: ../../sflphone-client-gnome/src/assistant.c:317 +#: ../../sflphone-client-gnome/src/assistant.c:316 msgid "_Email" msgstr " 邮件(E)" -#: ../../sflphone-client-gnome/src/assistant.c:332 +#: ../../sflphone-client-gnome/src/assistant.c:331 msgid "IAX2 account configuration" msgstr "IAX2帐户配置" -#: ../../sflphone-client-gnome/src/assistant.c:405 -#: ../../sflphone-client-gnome/src/config/configwindow.c:863 +#: ../../sflphone-client-gnome/src/assistant.c:404 +#: ../../sflphone-client-gnome/src/config/configwindow.c:855 msgid "Network Address Translation" msgstr "网络地址解析" -#: ../../sflphone-client-gnome/src/assistant.c:405 +#: ../../sflphone-client-gnome/src/assistant.c:404 msgid "You should probably enable this if you are behind a firewall." msgstr "如果你使用网络使用防火墙,你很有可能需要设定此项." -#: ../../sflphone-client-gnome/src/assistant.c:414 -#: ../../sflphone-client-gnome/src/config/configwindow.c:516 +#: ../../sflphone-client-gnome/src/assistant.c:413 +#: ../../sflphone-client-gnome/src/config/configwindow.c:532 msgid "E_nable STUN" msgstr "使用STUN(n)" -#: ../../sflphone-client-gnome/src/assistant.c:421 +#: ../../sflphone-client-gnome/src/assistant.c:420 msgid "_STUN server" msgstr "STUN服务器(S)" -#: ../../sflphone-client-gnome/src/assistant.c:435 +#: ../../sflphone-client-gnome/src/assistant.c:434 msgid "Account Registration" msgstr "帐户注册" -#: ../../sflphone-client-gnome/src/assistant.c:435 +#: ../../sflphone-client-gnome/src/assistant.c:434 msgid "Congratulations!" msgstr "恭喜!" -#: ../../sflphone-client-gnome/src/errors.c:28 +#: ../../sflphone-client-gnome/src/errors.c:29 msgid "" "ALSA notification\n" "\n" @@ -255,7 +255,7 @@ msgstr "" "\n" "打开回放设备时出错" -#: ../../sflphone-client-gnome/src/errors.c:31 +#: ../../sflphone-client-gnome/src/errors.c:32 msgid "" "ALSA notification\n" "\n" @@ -265,7 +265,7 @@ msgstr "" "\n" "打开采集设备时出错" -#: ../../sflphone-client-gnome/src/errors.c:34 +#: ../../sflphone-client-gnome/src/errors.c:35 msgid "" "Pulseaudio notification\n" "\n" @@ -303,114 +303,101 @@ msgstr "关于SFLphone" msgid "_Help" msgstr "帮助(H)" -#: ../../sflphone-client-gnome/src/menus.c:300 -#: ../../sflphone-client-gnome/src/menus.c:971 +#: ../../sflphone-client-gnome/src/menus.c:296 +#: ../../sflphone-client-gnome/src/menus.c:962 msgid "_New call" msgstr "新电话(N)" -#: ../../sflphone-client-gnome/src/menus.c:312 -#: ../../sflphone-client-gnome/src/menus.c:803 +#: ../../sflphone-client-gnome/src/menus.c:308 +#: ../../sflphone-client-gnome/src/menus.c:794 msgid "_Pick up" msgstr "拨出(P)" -#: ../../sflphone-client-gnome/src/menus.c:322 -#: ../../sflphone-client-gnome/src/menus.c:815 +#: ../../sflphone-client-gnome/src/menus.c:318 +#: ../../sflphone-client-gnome/src/menus.c:806 msgid "_Hang up" msgstr "放下(H)" -#: ../../sflphone-client-gnome/src/menus.c:332 -#: ../../sflphone-client-gnome/src/menus.c:827 +#: ../../sflphone-client-gnome/src/menus.c:328 +#: ../../sflphone-client-gnome/src/menus.c:818 msgid "On _Hold" msgstr "保持(H)" -#: ../../sflphone-client-gnome/src/menus.c:344 -#: ../../sflphone-client-gnome/src/menus.c:839 +#: ../../sflphone-client-gnome/src/menus.c:340 +#: ../../sflphone-client-gnome/src/menus.c:830 msgid "_Record" msgstr "记录(R)" -#: ../../sflphone-client-gnome/src/menus.c:358 +#: ../../sflphone-client-gnome/src/menus.c:354 msgid "_Account creation wizard" msgstr "帐户创建向导" -#: ../../sflphone-client-gnome/src/menus.c:388 +#: ../../sflphone-client-gnome/src/menus.c:384 msgid "_Call" msgstr "电话" -#: ../../sflphone-client-gnome/src/menus.c:561 -msgid "_Clear history" +#: ../../sflphone-client-gnome/src/menus.c:552 +#, fuzzy +msgid "Clear _history" msgstr "清空历史记录(C)" -#: ../../sflphone-client-gnome/src/menus.c:573 +#: ../../sflphone-client-gnome/src/menus.c:564 msgid "_Accounts" msgstr "帐户(A)" -#: ../../sflphone-client-gnome/src/menus.c:588 +#: ../../sflphone-client-gnome/src/menus.c:579 msgid "_Edit" msgstr "编辑(E)" -#: ../../sflphone-client-gnome/src/menus.c:649 +#: ../../sflphone-client-gnome/src/menus.c:640 msgid "_Dialpad" msgstr "拨号面板" -#: ../../sflphone-client-gnome/src/menus.c:661 +#: ../../sflphone-client-gnome/src/menus.c:652 msgid "_Volume controls" msgstr "音量控制(V)" -#: ../../sflphone-client-gnome/src/menus.c:679 +#: ../../sflphone-client-gnome/src/menus.c:670 msgid "_View" msgstr "查看(V)" -#: ../../sflphone-client-gnome/src/menus.c:899 +#: ../../sflphone-client-gnome/src/menus.c:890 msgid "_Call back" msgstr "回叫(C)" -#: ../../sflphone-client-gnome/src/menus.c:1082 +#: ../../sflphone-client-gnome/src/menus.c:1070 msgid "Edit phone" msgstr "编辑电话" -#: ../../sflphone-client-gnome/src/menus.c:1093 +#: ../../sflphone-client-gnome/src/menus.c:1081 msgid "Edit the phone number before making a call" msgstr "拨出电话前编辑电话号码" -#: ../../sflphone-client-gnome/src/sflnotify.c:38 -#: ../../sflphone-client-gnome/src/sflnotify.c:105 +#: ../../sflphone-client-gnome/src/sflnotify.c:71 +#: ../../sflphone-client-gnome/src/sflnotify.c:91 #, c-format msgid "%s account: %s" msgstr "%s 帐户: %s" -#: ../../sflphone-client-gnome/src/sflnotify.c:42 +#: ../../sflphone-client-gnome/src/sflnotify.c:75 #, c-format msgid "<i>From:</i> %s" msgstr "<i>拨入方:</i> %s" -#: ../../sflphone-client-gnome/src/sflnotify.c:57 -msgid "Accept" -msgstr "接受" - -#: ../../sflphone-client-gnome/src/sflnotify.c:58 -msgid "Refuse" -msgstr "拒绝" - -#: ../../sflphone-client-gnome/src/sflnotify.c:59 -#: ../../sflphone-client-gnome/src/sflnotify.c:122 -#: ../../sflphone-client-gnome/src/sflnotify.c:159 -msgid "Ignore" -msgstr "忽略" - -#: ../../sflphone-client-gnome/src/sflnotify.c:141 +#: ../../sflphone-client-gnome/src/sflnotify.c:111 #, c-format msgid "Calling with %s account <i>%s</i>" msgstr "使用%s帐户<i>%s</i>呼叫" -#: ../../sflphone-client-gnome/src/sflnotify.c:145 +#: ../../sflphone-client-gnome/src/sflnotify.c:115 msgid "Current account" msgstr "当前帐户" -#: ../../sflphone-client-gnome/src/sflnotify.c:174 +#: ../../sflphone-client-gnome/src/sflnotify.c:130 msgid "You haven't setup any accounts" msgstr "你没有设置任何帐户" -#: ../../sflphone-client-gnome/src/sflnotify.c:214 +#: ../../sflphone-client-gnome/src/sflnotify.c:147 msgid "You have no registered accounts" msgstr "未发现已注册帐户" @@ -431,136 +418,128 @@ msgstr "显示主窗口(S)" msgid "SFLphone - %i accounts configured" msgstr "SFLphone - %i 个帐户已配置" -#: ../../sflphone-client-gnome/src/timestamp.c:46 -msgid "<small>Missed call</small>" -msgstr "<small>未接电话</small>" - -#: ../../sflphone-client-gnome/src/timestamp.c:64 -#, c-format -msgid "<small>Duration:</small> %s" -msgstr "<small>时长:</small> %s" - #: ../../sflphone-client-gnome/src/toolbar.c:50 #, c-format msgid "\"Voicemail\" <%s>" msgstr "\"语音邮件\" <%s>" -#: ../../sflphone-client-gnome/src/toolbar.c:176 -#: ../../sflphone-client-gnome/src/toolbar.c:178 +#: ../../sflphone-client-gnome/src/toolbar.c:168 +#: ../../sflphone-client-gnome/src/toolbar.c:170 msgid "Place a call" msgstr "拨号" -#: ../../sflphone-client-gnome/src/toolbar.c:185 -#: ../../sflphone-client-gnome/src/toolbar.c:187 +#: ../../sflphone-client-gnome/src/toolbar.c:177 +#: ../../sflphone-client-gnome/src/toolbar.c:179 msgid "Pick up" msgstr "接电话" -#: ../../sflphone-client-gnome/src/toolbar.c:195 -#: ../../sflphone-client-gnome/src/toolbar.c:197 +#: ../../sflphone-client-gnome/src/toolbar.c:187 +#: ../../sflphone-client-gnome/src/toolbar.c:189 msgid "Hang up" msgstr "放电话" -#: ../../sflphone-client-gnome/src/toolbar.c:205 -#: ../../sflphone-client-gnome/src/toolbar.c:207 +#: ../../sflphone-client-gnome/src/toolbar.c:197 +#: ../../sflphone-client-gnome/src/toolbar.c:199 msgid "Off Hold" msgstr "恢复通话" -#: ../../sflphone-client-gnome/src/toolbar.c:216 -#: ../../sflphone-client-gnome/src/toolbar.c:218 +#: ../../sflphone-client-gnome/src/toolbar.c:208 +#: ../../sflphone-client-gnome/src/toolbar.c:210 msgid "On Hold" msgstr "待机" -#: ../../sflphone-client-gnome/src/toolbar.c:229 -#: ../../sflphone-client-gnome/src/toolbar.c:231 +#: ../../sflphone-client-gnome/src/toolbar.c:221 +#: ../../sflphone-client-gnome/src/toolbar.c:223 msgid "Transfer" msgstr "转接" -#: ../../sflphone-client-gnome/src/toolbar.c:241 -#: ../../sflphone-client-gnome/src/toolbar.c:243 +#: ../../sflphone-client-gnome/src/toolbar.c:233 +#: ../../sflphone-client-gnome/src/toolbar.c:235 msgid "History" msgstr "历史" -#: ../../sflphone-client-gnome/src/toolbar.c:252 -#: ../../sflphone-client-gnome/src/toolbar.c:254 +#: ../../sflphone-client-gnome/src/toolbar.c:244 +#: ../../sflphone-client-gnome/src/toolbar.c:246 msgid "Address book" msgstr "地址簿" -#: ../../sflphone-client-gnome/src/toolbar.c:260 -#: ../../sflphone-client-gnome/src/toolbar.c:264 +#: ../../sflphone-client-gnome/src/toolbar.c:252 +#: ../../sflphone-client-gnome/src/toolbar.c:256 msgid "Voicemail" msgstr "语音信箱" -#: ../../sflphone-client-gnome/src/toolbar.c:272 +#: ../../sflphone-client-gnome/src/toolbar.c:264 msgid "Record a call" msgstr "记录通话" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:108 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:113 msgid "Account settings" msgstr "帐户设置" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:120 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:125 msgid "Account Parameters" msgstr "帐户相关参数" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:142 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:147 msgid "_Enable this account" msgstr "启用该账户(E)" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:156 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:161 msgid "_Protocol" msgstr "协议(P)" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:174 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:179 msgid "Unknown" msgstr "未知" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:265 -#: ../../sflphone-client-gnome/src/config/configwindow.c:732 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:306 +#: ../../sflphone-client-gnome/src/config/configwindow.c:721 msgid "General" msgstr "常用配置" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:276 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:312 msgid "_Use Evolution address books" msgstr "使用Evolution地址薄(U)" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:283 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319 msgid "Download limit:" msgstr "下载上限:" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:294 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:327 +msgid "cards" +msgstr "" + +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333 msgid "_Display contact photo if available" msgstr "如果可行则显示联系人照片(D)" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:301 -msgid "Fields" -msgstr "字段" - -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:311 -msgid "Use the following fields from Evolution's address books:" +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:341 +#, fuzzy +msgid "Fields from Evolution's address books" msgstr "使用Evolution地址薄中的如下字段:" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:316 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:345 msgid "_Business phone" msgstr "商务电话(B)" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:321 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:351 msgid "_Home phone" msgstr "家庭电话(H)" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:326 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:357 msgid "_Mobile phone" msgstr "移动电话(M)" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:364 msgid "Address Books" msgstr "地址簿" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:343 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:368 msgid "Select which Evolution address books to use:" msgstr "选择使用如下Evolution地址薄:" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:377 -#: ../../sflphone-client-gnome/src/config/audioconf.c:574 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:404 +#: ../../sflphone-client-gnome/src/config/audioconf.c:576 msgid "Name" msgstr "名称" @@ -569,183 +548,191 @@ msgstr "名称" msgid "audio device index for output = %d" msgstr "音频设备输出索引 = %d" -#: ../../sflphone-client-gnome/src/config/audioconf.c:579 +#: ../../sflphone-client-gnome/src/config/audioconf.c:581 msgid "Frequency" msgstr "频率" -#: ../../sflphone-client-gnome/src/config/audioconf.c:584 +#: ../../sflphone-client-gnome/src/config/audioconf.c:586 msgid "Bitrate" msgstr "比率" -#: ../../sflphone-client-gnome/src/config/audioconf.c:589 +#: ../../sflphone-client-gnome/src/config/audioconf.c:591 msgid "Bandwidth" msgstr "带宽" -#: ../../sflphone-client-gnome/src/config/audioconf.c:652 -msgid "Pulseaudio" -msgstr "Pulseaudio" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:655 -msgid "ALSA" -msgstr "ALSA" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:681 +#: ../../sflphone-client-gnome/src/config/audioconf.c:662 msgid "ALSA plugin" msgstr "ALSA插件" -#: ../../sflphone-client-gnome/src/config/audioconf.c:703 +#: ../../sflphone-client-gnome/src/config/audioconf.c:684 msgid "Output" msgstr "输出" -#: ../../sflphone-client-gnome/src/config/audioconf.c:725 +#: ../../sflphone-client-gnome/src/config/audioconf.c:706 msgid "Input" msgstr "输入" -#: ../../sflphone-client-gnome/src/config/audioconf.c:758 -msgid "_Enable ringtones" -msgstr "启用铃声(E)" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:764 -msgid "Choose a ringtone" -msgstr "选择铃声" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:769 -msgid "Audio Files" -msgstr "音频文件" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:788 +#: ../../sflphone-client-gnome/src/config/audioconf.c:741 msgid "_Voice Activity Detection" msgstr "声音状态检测(V)" -#: ../../sflphone-client-gnome/src/config/audioconf.c:798 +#: ../../sflphone-client-gnome/src/config/audioconf.c:751 msgid "_Noise Reduction (Narrow-Band Companding)" msgstr "降噪处理-窄频压缩(N)" -#: ../../sflphone-client-gnome/src/config/audioconf.c:826 +#: ../../sflphone-client-gnome/src/config/audioconf.c:780 msgid "Sound Manager" msgstr "音频管理器" -#: ../../sflphone-client-gnome/src/config/audioconf.c:833 +#: ../../sflphone-client-gnome/src/config/audioconf.c:783 +#, fuzzy +msgid "_Pulseaudio" +msgstr "Pulseaudio" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:788 +#, fuzzy +msgid "_ALSA" +msgstr "ALSA" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:795 msgid "ALSA configuration" msgstr "ALSA 配置" -#: ../../sflphone-client-gnome/src/config/audioconf.c:850 +#: ../../sflphone-client-gnome/src/config/audioconf.c:812 msgid "Codecs" msgstr "Codecs编码" -#: ../../sflphone-client-gnome/src/config/audioconf.c:873 +#: ../../sflphone-client-gnome/src/config/audioconf.c:835 msgid "Ringtones" msgstr "铃声" -#: ../../sflphone-client-gnome/src/config/configwindow.c:402 +#: ../../sflphone-client-gnome/src/config/audioconf.c:841 +msgid "_Enable ringtones" +msgstr "启用铃声(E)" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:847 +msgid "Choose a ringtone" +msgstr "选择铃声" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:853 +msgid "Audio Files" +msgstr "音频文件" + +#: ../../sflphone-client-gnome/src/config/configwindow.c:418 msgid "Protocol" msgstr "协议" -#: ../../sflphone-client-gnome/src/config/configwindow.c:409 +#: ../../sflphone-client-gnome/src/config/configwindow.c:425 msgid "Status" msgstr "状态" -#: ../../sflphone-client-gnome/src/config/configwindow.c:512 +#: ../../sflphone-client-gnome/src/config/configwindow.c:528 msgid "Stun parameters will apply to each SIP account created." msgstr "Stun参数将应用于每一个注册的SIP帐户" -#: ../../sflphone-client-gnome/src/config/configwindow.c:520 +#: ../../sflphone-client-gnome/src/config/configwindow.c:536 msgid "Enable it if you are behind a firewall" msgstr "当使用防火墙时,启用该项" -#: ../../sflphone-client-gnome/src/config/configwindow.c:528 +#: ../../sflphone-client-gnome/src/config/configwindow.c:544 msgid "Format: name.server:port" msgstr "格式:name.server:port" -#: ../../sflphone-client-gnome/src/config/configwindow.c:579 +#: ../../sflphone-client-gnome/src/config/configwindow.c:589 msgid "Desktop Notifications" msgstr "桌面提示" -#: ../../sflphone-client-gnome/src/config/configwindow.c:588 +#: ../../sflphone-client-gnome/src/config/configwindow.c:593 msgid "_Enable notifications" msgstr "启用提示(E)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:594 +#: ../../sflphone-client-gnome/src/config/configwindow.c:599 msgid "Enable voicemail _notifications" msgstr "启用语音邮箱提示(n)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:605 +#: ../../sflphone-client-gnome/src/config/configwindow.c:611 msgid "System Tray Icon" msgstr "系统托盘图标" -#: ../../sflphone-client-gnome/src/config/configwindow.c:613 +#: ../../sflphone-client-gnome/src/config/configwindow.c:614 msgid "_Popup main window on incoming call" msgstr "来电时弹出主窗口(P)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:618 +#: ../../sflphone-client-gnome/src/config/configwindow.c:619 msgid "Ne_ver popup main window" msgstr "从不弹出主窗口(v)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:622 +#: ../../sflphone-client-gnome/src/config/configwindow.c:623 msgid "Hide SFLphone window on _startup" msgstr "在启动时隐藏SFLphone主窗口" -#: ../../sflphone-client-gnome/src/config/configwindow.c:628 +#: ../../sflphone-client-gnome/src/config/configwindow.c:629 msgid "Calls History" msgstr "拨号历史" -#: ../../sflphone-client-gnome/src/config/configwindow.c:636 -msgid "_History size limit" -msgstr "历史记录上限(H)" +#: ../../sflphone-client-gnome/src/config/configwindow.c:632 +msgid "_Keep my history for at least" +msgstr "" + +#: ../../sflphone-client-gnome/src/config/configwindow.c:643 +msgid " days" +msgstr "" -#: ../../sflphone-client-gnome/src/config/configwindow.c:653 +#: ../../sflphone-client-gnome/src/config/configwindow.c:647 msgid "PulseAudio sound server" msgstr "PulseAudio服务器" -#: ../../sflphone-client-gnome/src/config/configwindow.c:661 -msgid "Mute other applications during a _call" +#: ../../sflphone-client-gnome/src/config/configwindow.c:650 +#, fuzzy +msgid "_Mute other applications during a call" msgstr "当有来电时静音其它应用程序(c)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:674 +#: ../../sflphone-client-gnome/src/config/configwindow.c:664 msgid "SIP Port" msgstr "SIP端口号" -#: ../../sflphone-client-gnome/src/config/configwindow.c:687 +#: ../../sflphone-client-gnome/src/config/configwindow.c:677 msgid "Port:" msgstr "端口:" -#: ../../sflphone-client-gnome/src/config/configwindow.c:742 -msgid "_Recordings folder" +#: ../../sflphone-client-gnome/src/config/configwindow.c:725 +#, fuzzy +msgid "Recordings folder" msgstr "记录文件夹(R)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:748 +#: ../../sflphone-client-gnome/src/config/configwindow.c:731 msgid "Select a folder" msgstr "选择文件夹" -#: ../../sflphone-client-gnome/src/config/configwindow.c:773 +#: ../../sflphone-client-gnome/src/config/configwindow.c:765 msgid "Preferences" msgstr "属性" -#: ../../sflphone-client-gnome/src/config/configwindow.c:793 +#: ../../sflphone-client-gnome/src/config/configwindow.c:785 msgid "General Settings" msgstr "常用配置" -#: ../../sflphone-client-gnome/src/config/configwindow.c:798 +#: ../../sflphone-client-gnome/src/config/configwindow.c:790 msgid "Audio Settings" msgstr "音频配置" -#: ../../sflphone-client-gnome/src/config/configwindow.c:803 +#: ../../sflphone-client-gnome/src/config/configwindow.c:795 msgid "Recordings" msgstr "记录" -#: ../../sflphone-client-gnome/src/config/configwindow.c:808 +#: ../../sflphone-client-gnome/src/config/configwindow.c:800 msgid "Address Book" msgstr "地址簿" -#: ../../sflphone-client-gnome/src/config/configwindow.c:813 +#: ../../sflphone-client-gnome/src/config/configwindow.c:805 msgid "Hooks" msgstr "钩键" -#: ../../sflphone-client-gnome/src/config/configwindow.c:840 +#: ../../sflphone-client-gnome/src/config/configwindow.c:832 msgid "Accounts" msgstr "帐户" -#: ../../sflphone-client-gnome/src/config/configwindow.c:852 +#: ../../sflphone-client-gnome/src/config/configwindow.c:844 msgid "Configured Accounts" msgstr "已配置帐户" @@ -753,45 +740,94 @@ msgstr "已配置帐户" msgid "URL Passing" msgstr "传输URL" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:140 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:135 +msgid "Custom commands on incoming calls with URL," +msgstr "" + +#: ../../sflphone-client-gnome/src/config/hooks-config.c:138 #, c-format -msgid "" -"SFLphone can run custom commands if incoming calls come with an URL " -"attached.\n" -"In this case, %s will be replaced with the passed URL." +msgid "%s will be replaced with the passed URL." msgstr "" -"当来电有附加的URL时,SFLphone可运行客户命令.\n" -"在此情况下,传输的URL会被替换成%s." -#: ../../sflphone-client-gnome/src/config/hooks-config.c:143 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:141 msgid "Trigger on specific _SIP header" msgstr "激活指定的SIP头(S)" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:155 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:150 msgid "Trigger on _IAX2 URL" msgstr "激活IAX2 URL(I)" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:160 -msgid "_Command to run: " +#: ../../sflphone-client-gnome/src/config/hooks-config.c:155 +#, fuzzy +msgid "Command to _run: " msgstr "运行命令(C):" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:168 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:165 msgid "Phone Number Rewriting" msgstr "重设电话号码" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:178 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:169 msgid "_Prefix dialed numbers with:" msgstr "号码前缀:" -#: ../../sflphone-client-gnome/src/contacts/history.c:83 -#: ../../sflphone-client-gnome/src/contacts/searchbar.c:123 -msgid "Search history" -msgstr "查找历史记录" +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:55 +msgid "" +"Search all\n" +"Click here to change the search type" +msgstr "" + +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:67 +msgid "" +"Search by missed call\n" +"Click here to change the search type" +msgstr "" + +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:79 +msgid "" +"Search by incoming call\n" +"Click here to change the search type" +msgstr "" + +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:91 +msgid "" +"Search by outgoing call\n" +"Click here to change the search type" +msgstr "" + +#~ msgid "Accept" +#~ msgstr "接受" + +#~ msgid "Refuse" +#~ msgstr "拒绝" + +#~ msgid "Ignore" +#~ msgstr "忽略" + +#~ msgid "<small>Missed call</small>" +#~ msgstr "<small>未接电话</small>" + +#~ msgid "<small>Duration:</small> %s" +#~ msgstr "<small>时长:</small> %s" + +#~ msgid "Fields" +#~ msgstr "字段" + +#~ msgid "_History size limit" +#~ msgstr "历史记录上限(H)" + +#~ msgid "" +#~ "SFLphone can run custom commands if incoming calls come with an URL " +#~ "attached.\n" +#~ "In this case, %s will be replaced with the passed URL." +#~ msgstr "" +#~ "当来电有附加的URL时,SFLphone可运行客户命令.\n" +#~ "在此情况下,传输的URL会被替换成%s." + +#~ msgid "Search history" +#~ msgstr "查找历史记录" -#: ../../sflphone-client-gnome/src/contacts/history.c:83 -#: ../../sflphone-client-gnome/src/contacts/searchbar.c:110 -msgid "Search contact" -msgstr "查找联系人(S)" +#~ msgid "Search contact" +#~ msgstr "查找联系人(S)" #~ msgid "Registered to %s (%s)" #~ msgstr "注册到 %s (%s)" diff --git a/sflphone-common/po/zh_HK.po b/sflphone-common/po/zh_HK.po index bb25b47ecffb24f99e8eef4b1790661177fdebc5..2df95b89a9afc094bd3c61ee5762b0bf3baad932 100644 --- a/sflphone-common/po/zh_HK.po +++ b/sflphone-common/po/zh_HK.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: SFLphone 0.9.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-05-21 10:45-0400\n" +"POT-Creation-Date: 2009-06-12 18:05-0400\n" "PO-Revision-Date: 2008-10-28 14:15\n" "Last-Translator: Yun Liu <yun.liu@savoirfairelinux.com>\n" "Language-Team: SavoirFaireLinux Inc <sflphoneteam@savoirfairelinux.com>\n" @@ -17,50 +17,50 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n>1;\n" -#: ../../sflphone-client-gnome/src/accountlist.c:169 +#: ../../sflphone-client-gnome/src/accountlist.c:175 msgid "Registered" msgstr "已註冊" -#: ../../sflphone-client-gnome/src/accountlist.c:172 +#: ../../sflphone-client-gnome/src/accountlist.c:178 msgid "Not Registered" msgstr "未註冊" -#: ../../sflphone-client-gnome/src/accountlist.c:175 +#: ../../sflphone-client-gnome/src/accountlist.c:181 msgid "Trying..." msgstr "正在連接..." -#: ../../sflphone-client-gnome/src/accountlist.c:178 -#: ../../sflphone-client-gnome/src/sflnotify.c:176 -#: ../../sflphone-client-gnome/src/sflnotify.c:217 +#: ../../sflphone-client-gnome/src/accountlist.c:184 +#: ../../sflphone-client-gnome/src/sflnotify.c:131 +#: ../../sflphone-client-gnome/src/sflnotify.c:148 msgid "Error" msgstr "註冊失敗" -#: ../../sflphone-client-gnome/src/accountlist.c:181 +#: ../../sflphone-client-gnome/src/accountlist.c:187 msgid "Bad authentification" msgstr "認證錯誤" -#: ../../sflphone-client-gnome/src/accountlist.c:184 +#: ../../sflphone-client-gnome/src/accountlist.c:190 msgid "Network unreachable" msgstr "網路連線失敗" -#: ../../sflphone-client-gnome/src/accountlist.c:187 +#: ../../sflphone-client-gnome/src/accountlist.c:193 msgid "Host unreachable" msgstr "伺服器連線失敗" -#: ../../sflphone-client-gnome/src/accountlist.c:190 +#: ../../sflphone-client-gnome/src/accountlist.c:196 msgid "Stun configuration error" msgstr "Stun配置有誤" -#: ../../sflphone-client-gnome/src/accountlist.c:193 +#: ../../sflphone-client-gnome/src/accountlist.c:199 msgid "Stun server invalid" msgstr "Stun伺服器無效" -#: ../../sflphone-client-gnome/src/accountlist.c:196 +#: ../../sflphone-client-gnome/src/accountlist.c:202 msgid "Invalid" msgstr "無效" #: ../../sflphone-client-gnome/src/actions.c:55 -#: ../../sflphone-client-gnome/src/sflnotify.c:108 +#: ../../sflphone-client-gnome/src/sflnotify.c:94 #, c-format msgid "%d voice mails" msgstr "%d 個語音郵件" @@ -79,7 +79,7 @@ msgstr "" msgid "No registered account" msgstr "未發現已註冊帳戶" -#: ../../sflphone-client-gnome/src/actions.c:229 +#: ../../sflphone-client-gnome/src/actions.c:232 msgid "" "Unable to connect to the SFLphone server.\n" "Make sure the daemon is running." @@ -87,17 +87,17 @@ msgstr "" "連接SFLphone伺服器失敗.\n" "請核查daemon是否正在運行." -#: ../../sflphone-client-gnome/src/actions.c:787 +#: ../../sflphone-client-gnome/src/actions.c:807 #, c-format msgid "IP call - %s" msgstr "IP電話- %s" -#: ../../sflphone-client-gnome/src/actions.c:790 +#: ../../sflphone-client-gnome/src/actions.c:810 #, c-format msgid "Using %s (%s) - Codec: %s" msgstr "" -#: ../../sflphone-client-gnome/src/actions.c:880 +#: ../../sflphone-client-gnome/src/actions.c:900 #, c-format msgid "" "<b>Error: No audio codecs found.\n" @@ -127,124 +127,124 @@ msgstr "" "伺服器: %s\n" "使用者名稱: %s\n" -#: ../../sflphone-client-gnome/src/assistant.c:160 +#: ../../sflphone-client-gnome/src/assistant.c:159 msgid "SFLphone account configuration wizard" msgstr "SFLphone 帳戶設置向導" -#: ../../sflphone-client-gnome/src/assistant.c:186 +#: ../../sflphone-client-gnome/src/assistant.c:185 msgid "Welcome to SFLphone!" msgstr "歡迎使用SFLphone!" -#: ../../sflphone-client-gnome/src/assistant.c:187 +#: ../../sflphone-client-gnome/src/assistant.c:186 msgid "This installation wizard will help you configure an account." msgstr "安裝向導將幫助您配置帳戶" -#: ../../sflphone-client-gnome/src/assistant.c:201 +#: ../../sflphone-client-gnome/src/assistant.c:200 msgid "VoIP Protocols" msgstr "VoIP協議" -#: ../../sflphone-client-gnome/src/assistant.c:201 +#: ../../sflphone-client-gnome/src/assistant.c:200 msgid "Select an account type:" msgstr "選擇帳戶類型:" -#: ../../sflphone-client-gnome/src/assistant.c:219 +#: ../../sflphone-client-gnome/src/assistant.c:218 msgid "Account" msgstr "帳戶" -#: ../../sflphone-client-gnome/src/assistant.c:219 +#: ../../sflphone-client-gnome/src/assistant.c:218 msgid "Please select one of the following option:" msgstr "請選擇以下選項中的一個:" -#: ../../sflphone-client-gnome/src/assistant.c:221 +#: ../../sflphone-client-gnome/src/assistant.c:220 msgid "Create a free SIP/IAX2 account on sflphone.org" msgstr "在sflphone.org上創建免費的SIP/IAX2帳戶" -#: ../../sflphone-client-gnome/src/assistant.c:223 +#: ../../sflphone-client-gnome/src/assistant.c:222 msgid "Register an existing SIP or IAX2 account" msgstr "註冊已存在的SIP或IAX2帳戶" -#: ../../sflphone-client-gnome/src/assistant.c:236 +#: ../../sflphone-client-gnome/src/assistant.c:235 msgid "SIP account configuration" msgstr "SIP帳戶配置" -#: ../../sflphone-client-gnome/src/assistant.c:236 -#: ../../sflphone-client-gnome/src/assistant.c:332 +#: ../../sflphone-client-gnome/src/assistant.c:235 +#: ../../sflphone-client-gnome/src/assistant.c:331 msgid "Please fill the following information:" msgstr "請填寫如下信息:" -#: ../../sflphone-client-gnome/src/assistant.c:244 -#: ../../sflphone-client-gnome/src/assistant.c:340 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:148 +#: ../../sflphone-client-gnome/src/assistant.c:243 +#: ../../sflphone-client-gnome/src/assistant.c:339 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:153 msgid "_Alias" msgstr "別稱(A)" -#: ../../sflphone-client-gnome/src/assistant.c:252 -#: ../../sflphone-client-gnome/src/assistant.c:348 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:184 +#: ../../sflphone-client-gnome/src/assistant.c:251 +#: ../../sflphone-client-gnome/src/assistant.c:347 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:189 msgid "_Host name" msgstr "主机名稱(H)" -#: ../../sflphone-client-gnome/src/assistant.c:260 -#: ../../sflphone-client-gnome/src/assistant.c:356 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:192 +#: ../../sflphone-client-gnome/src/assistant.c:259 +#: ../../sflphone-client-gnome/src/assistant.c:355 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:197 msgid "_User name" msgstr "使用者名稱(U)" -#: ../../sflphone-client-gnome/src/assistant.c:276 -#: ../../sflphone-client-gnome/src/assistant.c:371 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:207 +#: ../../sflphone-client-gnome/src/assistant.c:275 +#: ../../sflphone-client-gnome/src/assistant.c:370 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:212 msgid "_Password" msgstr "密碼(P)" -#: ../../sflphone-client-gnome/src/assistant.c:294 -#: ../../sflphone-client-gnome/src/assistant.c:387 -#: ../../sflphone-client-gnome/src/config/accountwindow.c:223 +#: ../../sflphone-client-gnome/src/assistant.c:293 +#: ../../sflphone-client-gnome/src/assistant.c:386 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:228 msgid "_Voicemail number" msgstr "語音郵箱(V)" -#: ../../sflphone-client-gnome/src/assistant.c:309 +#: ../../sflphone-client-gnome/src/assistant.c:308 msgid "Optional Email Address " msgstr "可選郵件地址 " -#: ../../sflphone-client-gnome/src/assistant.c:309 +#: ../../sflphone-client-gnome/src/assistant.c:308 msgid "This email address will be use to send your voicemail messages" msgstr "這個郵件地址將被用來發送您的語音郵箱消息" -#: ../../sflphone-client-gnome/src/assistant.c:317 +#: ../../sflphone-client-gnome/src/assistant.c:316 msgid "_Email" msgstr "郵件(E)" -#: ../../sflphone-client-gnome/src/assistant.c:332 +#: ../../sflphone-client-gnome/src/assistant.c:331 msgid "IAX2 account configuration" msgstr "IAX2帳戶配置" -#: ../../sflphone-client-gnome/src/assistant.c:405 -#: ../../sflphone-client-gnome/src/config/configwindow.c:863 +#: ../../sflphone-client-gnome/src/assistant.c:404 +#: ../../sflphone-client-gnome/src/config/configwindow.c:855 msgid "Network Address Translation" msgstr "網路地址分析" -#: ../../sflphone-client-gnome/src/assistant.c:405 +#: ../../sflphone-client-gnome/src/assistant.c:404 msgid "You should probably enable this if you are behind a firewall." msgstr "如果你使用網路防火牆,你很有可能需要設定該項." -#: ../../sflphone-client-gnome/src/assistant.c:414 -#: ../../sflphone-client-gnome/src/config/configwindow.c:516 +#: ../../sflphone-client-gnome/src/assistant.c:413 +#: ../../sflphone-client-gnome/src/config/configwindow.c:532 msgid "E_nable STUN" msgstr "啟用STUN(n)" -#: ../../sflphone-client-gnome/src/assistant.c:421 +#: ../../sflphone-client-gnome/src/assistant.c:420 msgid "_STUN server" msgstr "STUN伺服器(S)" -#: ../../sflphone-client-gnome/src/assistant.c:435 +#: ../../sflphone-client-gnome/src/assistant.c:434 msgid "Account Registration" msgstr "帳戶註冊" -#: ../../sflphone-client-gnome/src/assistant.c:435 +#: ../../sflphone-client-gnome/src/assistant.c:434 msgid "Congratulations!" msgstr "恭喜!" -#: ../../sflphone-client-gnome/src/errors.c:28 +#: ../../sflphone-client-gnome/src/errors.c:29 msgid "" "ALSA notification\n" "\n" @@ -254,7 +254,7 @@ msgstr "" "\n" "打開回放設備時出錯" -#: ../../sflphone-client-gnome/src/errors.c:31 +#: ../../sflphone-client-gnome/src/errors.c:32 msgid "" "ALSA notification\n" "\n" @@ -264,7 +264,7 @@ msgstr "" "\n" "打開采集設備時出錯" -#: ../../sflphone-client-gnome/src/errors.c:34 +#: ../../sflphone-client-gnome/src/errors.c:35 msgid "" "Pulseaudio notification\n" "\n" @@ -302,114 +302,101 @@ msgstr "有關SFLphone" msgid "_Help" msgstr "幫助(H)" -#: ../../sflphone-client-gnome/src/menus.c:300 -#: ../../sflphone-client-gnome/src/menus.c:971 +#: ../../sflphone-client-gnome/src/menus.c:296 +#: ../../sflphone-client-gnome/src/menus.c:962 msgid "_New call" msgstr "新電話(N)" -#: ../../sflphone-client-gnome/src/menus.c:312 -#: ../../sflphone-client-gnome/src/menus.c:803 +#: ../../sflphone-client-gnome/src/menus.c:308 +#: ../../sflphone-client-gnome/src/menus.c:794 msgid "_Pick up" msgstr "撥出(P)" -#: ../../sflphone-client-gnome/src/menus.c:322 -#: ../../sflphone-client-gnome/src/menus.c:815 +#: ../../sflphone-client-gnome/src/menus.c:318 +#: ../../sflphone-client-gnome/src/menus.c:806 msgid "_Hang up" msgstr "放下(H)" -#: ../../sflphone-client-gnome/src/menus.c:332 -#: ../../sflphone-client-gnome/src/menus.c:827 +#: ../../sflphone-client-gnome/src/menus.c:328 +#: ../../sflphone-client-gnome/src/menus.c:818 msgid "On _Hold" msgstr "待机" -#: ../../sflphone-client-gnome/src/menus.c:344 -#: ../../sflphone-client-gnome/src/menus.c:839 +#: ../../sflphone-client-gnome/src/menus.c:340 +#: ../../sflphone-client-gnome/src/menus.c:830 msgid "_Record" msgstr "記錄(R)" -#: ../../sflphone-client-gnome/src/menus.c:358 +#: ../../sflphone-client-gnome/src/menus.c:354 msgid "_Account creation wizard" msgstr "帳戶創建向導(A)" -#: ../../sflphone-client-gnome/src/menus.c:388 +#: ../../sflphone-client-gnome/src/menus.c:384 msgid "_Call" msgstr "電話" -#: ../../sflphone-client-gnome/src/menus.c:561 -msgid "_Clear history" +#: ../../sflphone-client-gnome/src/menus.c:552 +#, fuzzy +msgid "Clear _history" msgstr "清空曆史記錄(C)" -#: ../../sflphone-client-gnome/src/menus.c:573 +#: ../../sflphone-client-gnome/src/menus.c:564 msgid "_Accounts" msgstr "帳戶(A)" -#: ../../sflphone-client-gnome/src/menus.c:588 +#: ../../sflphone-client-gnome/src/menus.c:579 msgid "_Edit" msgstr "編輯(E)" -#: ../../sflphone-client-gnome/src/menus.c:649 +#: ../../sflphone-client-gnome/src/menus.c:640 msgid "_Dialpad" msgstr "撥號面板" -#: ../../sflphone-client-gnome/src/menus.c:661 +#: ../../sflphone-client-gnome/src/menus.c:652 msgid "_Volume controls" msgstr "音量控制(V)" -#: ../../sflphone-client-gnome/src/menus.c:679 +#: ../../sflphone-client-gnome/src/menus.c:670 msgid "_View" msgstr "查看(V)" -#: ../../sflphone-client-gnome/src/menus.c:899 +#: ../../sflphone-client-gnome/src/menus.c:890 msgid "_Call back" msgstr "回叫(C)" -#: ../../sflphone-client-gnome/src/menus.c:1082 +#: ../../sflphone-client-gnome/src/menus.c:1070 msgid "Edit phone" msgstr "編輯電話" -#: ../../sflphone-client-gnome/src/menus.c:1093 +#: ../../sflphone-client-gnome/src/menus.c:1081 msgid "Edit the phone number before making a call" msgstr "撥出電話前編輯電話號碼" -#: ../../sflphone-client-gnome/src/sflnotify.c:38 -#: ../../sflphone-client-gnome/src/sflnotify.c:105 +#: ../../sflphone-client-gnome/src/sflnotify.c:71 +#: ../../sflphone-client-gnome/src/sflnotify.c:91 #, c-format msgid "%s account: %s" msgstr "%s 帳戶: %s" -#: ../../sflphone-client-gnome/src/sflnotify.c:42 +#: ../../sflphone-client-gnome/src/sflnotify.c:75 #, c-format msgid "<i>From:</i> %s" msgstr "<i>撥入方:</i> %s" -#: ../../sflphone-client-gnome/src/sflnotify.c:57 -msgid "Accept" -msgstr "接受" - -#: ../../sflphone-client-gnome/src/sflnotify.c:58 -msgid "Refuse" -msgstr "拒絕" - -#: ../../sflphone-client-gnome/src/sflnotify.c:59 -#: ../../sflphone-client-gnome/src/sflnotify.c:122 -#: ../../sflphone-client-gnome/src/sflnotify.c:159 -msgid "Ignore" -msgstr "忽略" - -#: ../../sflphone-client-gnome/src/sflnotify.c:141 +#: ../../sflphone-client-gnome/src/sflnotify.c:111 #, c-format msgid "Calling with %s account <i>%s</i>" msgstr "使用%s帳戶<i>%s</i>呼叫" -#: ../../sflphone-client-gnome/src/sflnotify.c:145 +#: ../../sflphone-client-gnome/src/sflnotify.c:115 msgid "Current account" msgstr "當前帳戶" -#: ../../sflphone-client-gnome/src/sflnotify.c:174 +#: ../../sflphone-client-gnome/src/sflnotify.c:130 msgid "You haven't setup any accounts" msgstr "你沒有設置任何帳戶" -#: ../../sflphone-client-gnome/src/sflnotify.c:214 +#: ../../sflphone-client-gnome/src/sflnotify.c:147 msgid "You have no registered accounts" msgstr "未發現已註冊帳戶" @@ -430,136 +417,128 @@ msgstr "顯示主窗口(S)" msgid "SFLphone - %i accounts configured" msgstr "SFLphone - %i 個帳戶已配置" -#: ../../sflphone-client-gnome/src/timestamp.c:46 -msgid "<small>Missed call</small>" -msgstr "<small>未接電話</small>" - -#: ../../sflphone-client-gnome/src/timestamp.c:64 -#, c-format -msgid "<small>Duration:</small> %s" -msgstr "<small>時長:</small> %s" - #: ../../sflphone-client-gnome/src/toolbar.c:50 #, c-format msgid "\"Voicemail\" <%s>" msgstr "\"語音郵件\" <%s>" -#: ../../sflphone-client-gnome/src/toolbar.c:176 -#: ../../sflphone-client-gnome/src/toolbar.c:178 +#: ../../sflphone-client-gnome/src/toolbar.c:168 +#: ../../sflphone-client-gnome/src/toolbar.c:170 msgid "Place a call" msgstr "打電話" -#: ../../sflphone-client-gnome/src/toolbar.c:185 -#: ../../sflphone-client-gnome/src/toolbar.c:187 +#: ../../sflphone-client-gnome/src/toolbar.c:177 +#: ../../sflphone-client-gnome/src/toolbar.c:179 msgid "Pick up" msgstr "接電話" -#: ../../sflphone-client-gnome/src/toolbar.c:195 -#: ../../sflphone-client-gnome/src/toolbar.c:197 +#: ../../sflphone-client-gnome/src/toolbar.c:187 +#: ../../sflphone-client-gnome/src/toolbar.c:189 msgid "Hang up" msgstr "放電話" -#: ../../sflphone-client-gnome/src/toolbar.c:205 -#: ../../sflphone-client-gnome/src/toolbar.c:207 +#: ../../sflphone-client-gnome/src/toolbar.c:197 +#: ../../sflphone-client-gnome/src/toolbar.c:199 msgid "Off Hold" msgstr "恢复通話" -#: ../../sflphone-client-gnome/src/toolbar.c:216 -#: ../../sflphone-client-gnome/src/toolbar.c:218 +#: ../../sflphone-client-gnome/src/toolbar.c:208 +#: ../../sflphone-client-gnome/src/toolbar.c:210 msgid "On Hold" msgstr "待机" -#: ../../sflphone-client-gnome/src/toolbar.c:229 -#: ../../sflphone-client-gnome/src/toolbar.c:231 +#: ../../sflphone-client-gnome/src/toolbar.c:221 +#: ../../sflphone-client-gnome/src/toolbar.c:223 msgid "Transfer" msgstr "轉接" -#: ../../sflphone-client-gnome/src/toolbar.c:241 -#: ../../sflphone-client-gnome/src/toolbar.c:243 +#: ../../sflphone-client-gnome/src/toolbar.c:233 +#: ../../sflphone-client-gnome/src/toolbar.c:235 msgid "History" msgstr "歷史" -#: ../../sflphone-client-gnome/src/toolbar.c:252 -#: ../../sflphone-client-gnome/src/toolbar.c:254 +#: ../../sflphone-client-gnome/src/toolbar.c:244 +#: ../../sflphone-client-gnome/src/toolbar.c:246 msgid "Address book" msgstr "地址簿" -#: ../../sflphone-client-gnome/src/toolbar.c:260 -#: ../../sflphone-client-gnome/src/toolbar.c:264 +#: ../../sflphone-client-gnome/src/toolbar.c:252 +#: ../../sflphone-client-gnome/src/toolbar.c:256 msgid "Voicemail" msgstr "語音郵件" -#: ../../sflphone-client-gnome/src/toolbar.c:272 +#: ../../sflphone-client-gnome/src/toolbar.c:264 msgid "Record a call" msgstr "記錄通話" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:108 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:113 msgid "Account settings" msgstr "帳戶設置" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:120 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:125 msgid "Account Parameters" msgstr "帳戶相關參數" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:142 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:147 msgid "_Enable this account" msgstr "啟用該賬戶(E)" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:156 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:161 msgid "_Protocol" msgstr "協議(P)" -#: ../../sflphone-client-gnome/src/config/accountwindow.c:174 +#: ../../sflphone-client-gnome/src/config/accountwindow.c:179 msgid "Unknown" msgstr "未知" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:265 -#: ../../sflphone-client-gnome/src/config/configwindow.c:732 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:306 +#: ../../sflphone-client-gnome/src/config/configwindow.c:721 msgid "General" msgstr "常用配置" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:276 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:312 msgid "_Use Evolution address books" msgstr "使用Evolution地址薄(U)" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:283 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:319 msgid "Download limit:" msgstr "下載上限:" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:294 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:327 +msgid "cards" +msgstr "" + +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333 msgid "_Display contact photo if available" msgstr "如果可以則顯示聯繫人照片(D)" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:301 -msgid "Fields" -msgstr "字段" - -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:311 -msgid "Use the following fields from Evolution's address books:" +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:341 +#, fuzzy +msgid "Fields from Evolution's address books" msgstr "使用Evolution地址薄中的如下字段:" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:316 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:345 msgid "_Business phone" msgstr "商務電話(B)" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:321 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:351 msgid "_Home phone" msgstr "家庭電話(H)" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:326 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:357 msgid "_Mobile phone" msgstr "移動電話(M)" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:333 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:364 msgid "Address Books" msgstr "地址簿" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:343 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:368 msgid "Select which Evolution address books to use:" msgstr "選擇使用如下Evolution地址薄:" -#: ../../sflphone-client-gnome/src/config/addressbook-config.c:377 -#: ../../sflphone-client-gnome/src/config/audioconf.c:574 +#: ../../sflphone-client-gnome/src/config/addressbook-config.c:404 +#: ../../sflphone-client-gnome/src/config/audioconf.c:576 msgid "Name" msgstr "名稱" @@ -568,183 +547,191 @@ msgstr "名稱" msgid "audio device index for output = %d" msgstr "音訊設備輸出索引 = %d" -#: ../../sflphone-client-gnome/src/config/audioconf.c:579 +#: ../../sflphone-client-gnome/src/config/audioconf.c:581 msgid "Frequency" msgstr "顰律" -#: ../../sflphone-client-gnome/src/config/audioconf.c:584 +#: ../../sflphone-client-gnome/src/config/audioconf.c:586 msgid "Bitrate" msgstr "比率" -#: ../../sflphone-client-gnome/src/config/audioconf.c:589 +#: ../../sflphone-client-gnome/src/config/audioconf.c:591 msgid "Bandwidth" msgstr "顰寬" -#: ../../sflphone-client-gnome/src/config/audioconf.c:652 -msgid "Pulseaudio" -msgstr "Pulseaudio" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:655 -msgid "ALSA" -msgstr "ALSA" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:681 +#: ../../sflphone-client-gnome/src/config/audioconf.c:662 msgid "ALSA plugin" msgstr "ALSA插件" -#: ../../sflphone-client-gnome/src/config/audioconf.c:703 +#: ../../sflphone-client-gnome/src/config/audioconf.c:684 msgid "Output" msgstr "輸出" -#: ../../sflphone-client-gnome/src/config/audioconf.c:725 +#: ../../sflphone-client-gnome/src/config/audioconf.c:706 msgid "Input" msgstr "輸入" -#: ../../sflphone-client-gnome/src/config/audioconf.c:758 -msgid "_Enable ringtones" -msgstr "啟動鈴聲(E)" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:764 -msgid "Choose a ringtone" -msgstr "鈴聲選擇" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:769 -msgid "Audio Files" -msgstr "音訊檔案" - -#: ../../sflphone-client-gnome/src/config/audioconf.c:788 +#: ../../sflphone-client-gnome/src/config/audioconf.c:741 msgid "_Voice Activity Detection" msgstr "聲音狀態檢測(V)" -#: ../../sflphone-client-gnome/src/config/audioconf.c:798 +#: ../../sflphone-client-gnome/src/config/audioconf.c:751 msgid "_Noise Reduction (Narrow-Band Companding)" msgstr "降噪處理-窄頻壓縮(N)" -#: ../../sflphone-client-gnome/src/config/audioconf.c:826 +#: ../../sflphone-client-gnome/src/config/audioconf.c:780 msgid "Sound Manager" msgstr "聲音管理器" -#: ../../sflphone-client-gnome/src/config/audioconf.c:833 +#: ../../sflphone-client-gnome/src/config/audioconf.c:783 +#, fuzzy +msgid "_Pulseaudio" +msgstr "Pulseaudio" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:788 +#, fuzzy +msgid "_ALSA" +msgstr "ALSA" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:795 msgid "ALSA configuration" msgstr "ALSA 配置" -#: ../../sflphone-client-gnome/src/config/audioconf.c:850 +#: ../../sflphone-client-gnome/src/config/audioconf.c:812 msgid "Codecs" msgstr "編碼" -#: ../../sflphone-client-gnome/src/config/audioconf.c:873 +#: ../../sflphone-client-gnome/src/config/audioconf.c:835 msgid "Ringtones" msgstr "鈴聲" -#: ../../sflphone-client-gnome/src/config/configwindow.c:402 +#: ../../sflphone-client-gnome/src/config/audioconf.c:841 +msgid "_Enable ringtones" +msgstr "啟動鈴聲(E)" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:847 +msgid "Choose a ringtone" +msgstr "鈴聲選擇" + +#: ../../sflphone-client-gnome/src/config/audioconf.c:853 +msgid "Audio Files" +msgstr "音訊檔案" + +#: ../../sflphone-client-gnome/src/config/configwindow.c:418 msgid "Protocol" msgstr "協議" -#: ../../sflphone-client-gnome/src/config/configwindow.c:409 +#: ../../sflphone-client-gnome/src/config/configwindow.c:425 msgid "Status" msgstr "狀態" -#: ../../sflphone-client-gnome/src/config/configwindow.c:512 +#: ../../sflphone-client-gnome/src/config/configwindow.c:528 msgid "Stun parameters will apply to each SIP account created." msgstr "Stun參數將應用於每一個註冊的SIP帳戶" -#: ../../sflphone-client-gnome/src/config/configwindow.c:520 +#: ../../sflphone-client-gnome/src/config/configwindow.c:536 msgid "Enable it if you are behind a firewall" msgstr "當使用防火牆時,需要設定此項" -#: ../../sflphone-client-gnome/src/config/configwindow.c:528 +#: ../../sflphone-client-gnome/src/config/configwindow.c:544 msgid "Format: name.server:port" msgstr "格式:name.server:port" -#: ../../sflphone-client-gnome/src/config/configwindow.c:579 +#: ../../sflphone-client-gnome/src/config/configwindow.c:589 msgid "Desktop Notifications" msgstr "桌面提示" -#: ../../sflphone-client-gnome/src/config/configwindow.c:588 +#: ../../sflphone-client-gnome/src/config/configwindow.c:593 msgid "_Enable notifications" msgstr "啟動提示(E)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:594 +#: ../../sflphone-client-gnome/src/config/configwindow.c:599 msgid "Enable voicemail _notifications" msgstr "啟用語音郵箱提示(n)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:605 +#: ../../sflphone-client-gnome/src/config/configwindow.c:611 msgid "System Tray Icon" msgstr "系統托盤圖標" -#: ../../sflphone-client-gnome/src/config/configwindow.c:613 +#: ../../sflphone-client-gnome/src/config/configwindow.c:614 msgid "_Popup main window on incoming call" msgstr "來電話時彈出主視窗(P)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:618 +#: ../../sflphone-client-gnome/src/config/configwindow.c:619 msgid "Ne_ver popup main window" msgstr "從不彈出主視窗(v)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:622 +#: ../../sflphone-client-gnome/src/config/configwindow.c:623 msgid "Hide SFLphone window on _startup" msgstr "在啟動時隱藏SFLphone主窗口" -#: ../../sflphone-client-gnome/src/config/configwindow.c:628 +#: ../../sflphone-client-gnome/src/config/configwindow.c:629 msgid "Calls History" msgstr "打電話歷史" -#: ../../sflphone-client-gnome/src/config/configwindow.c:636 -msgid "_History size limit" -msgstr "歷史記錄上限(H)" +#: ../../sflphone-client-gnome/src/config/configwindow.c:632 +msgid "_Keep my history for at least" +msgstr "" + +#: ../../sflphone-client-gnome/src/config/configwindow.c:643 +msgid " days" +msgstr "" -#: ../../sflphone-client-gnome/src/config/configwindow.c:653 +#: ../../sflphone-client-gnome/src/config/configwindow.c:647 msgid "PulseAudio sound server" msgstr "PulseAudio聲音伺服器" -#: ../../sflphone-client-gnome/src/config/configwindow.c:661 -msgid "Mute other applications during a _call" +#: ../../sflphone-client-gnome/src/config/configwindow.c:650 +#, fuzzy +msgid "_Mute other applications during a call" msgstr "當有來電時靜音其它應用程序(c)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:674 +#: ../../sflphone-client-gnome/src/config/configwindow.c:664 msgid "SIP Port" msgstr "SIP端口" -#: ../../sflphone-client-gnome/src/config/configwindow.c:687 +#: ../../sflphone-client-gnome/src/config/configwindow.c:677 msgid "Port:" msgstr "端口:" -#: ../../sflphone-client-gnome/src/config/configwindow.c:742 -msgid "_Recordings folder" +#: ../../sflphone-client-gnome/src/config/configwindow.c:725 +#, fuzzy +msgid "Recordings folder" msgstr "記錄文件夾(R)" -#: ../../sflphone-client-gnome/src/config/configwindow.c:748 +#: ../../sflphone-client-gnome/src/config/configwindow.c:731 msgid "Select a folder" msgstr "選擇文件夾" -#: ../../sflphone-client-gnome/src/config/configwindow.c:773 +#: ../../sflphone-client-gnome/src/config/configwindow.c:765 msgid "Preferences" msgstr "屬性" -#: ../../sflphone-client-gnome/src/config/configwindow.c:793 +#: ../../sflphone-client-gnome/src/config/configwindow.c:785 msgid "General Settings" msgstr "常用配置" -#: ../../sflphone-client-gnome/src/config/configwindow.c:798 +#: ../../sflphone-client-gnome/src/config/configwindow.c:790 msgid "Audio Settings" msgstr "音訊配置" -#: ../../sflphone-client-gnome/src/config/configwindow.c:803 +#: ../../sflphone-client-gnome/src/config/configwindow.c:795 msgid "Recordings" msgstr "記錄" -#: ../../sflphone-client-gnome/src/config/configwindow.c:808 +#: ../../sflphone-client-gnome/src/config/configwindow.c:800 msgid "Address Book" msgstr "地址簿" -#: ../../sflphone-client-gnome/src/config/configwindow.c:813 +#: ../../sflphone-client-gnome/src/config/configwindow.c:805 msgid "Hooks" msgstr "鉤鍵" -#: ../../sflphone-client-gnome/src/config/configwindow.c:840 +#: ../../sflphone-client-gnome/src/config/configwindow.c:832 msgid "Accounts" msgstr "帳戶" -#: ../../sflphone-client-gnome/src/config/configwindow.c:852 +#: ../../sflphone-client-gnome/src/config/configwindow.c:844 msgid "Configured Accounts" msgstr "已配置帳戶" @@ -752,45 +739,94 @@ msgstr "已配置帳戶" msgid "URL Passing" msgstr "傳輸URL" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:140 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:135 +msgid "Custom commands on incoming calls with URL," +msgstr "" + +#: ../../sflphone-client-gnome/src/config/hooks-config.c:138 #, c-format -msgid "" -"SFLphone can run custom commands if incoming calls come with an URL " -"attached.\n" -"In this case, %s will be replaced with the passed URL." +msgid "%s will be replaced with the passed URL." msgstr "" -"當來電有附加的URL時,SFLphone可運行客戶命令.\n" -"在此情況下,傳輸的URL會被替換成%s." -#: ../../sflphone-client-gnome/src/config/hooks-config.c:143 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:141 msgid "Trigger on specific _SIP header" msgstr "激活指定的SIP頭(S)" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:155 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:150 msgid "Trigger on _IAX2 URL" msgstr "激活IAX2 URL(I)" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:160 -msgid "_Command to run: " +#: ../../sflphone-client-gnome/src/config/hooks-config.c:155 +#, fuzzy +msgid "Command to _run: " msgstr "運行命令(C):" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:168 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:165 msgid "Phone Number Rewriting" msgstr "重設電話號碼" -#: ../../sflphone-client-gnome/src/config/hooks-config.c:178 +#: ../../sflphone-client-gnome/src/config/hooks-config.c:169 msgid "_Prefix dialed numbers with:" msgstr "號碼前綴:" -#: ../../sflphone-client-gnome/src/contacts/history.c:83 -#: ../../sflphone-client-gnome/src/contacts/searchbar.c:123 -msgid "Search history" -msgstr "搜尋歷史記錄" +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:55 +msgid "" +"Search all\n" +"Click here to change the search type" +msgstr "" + +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:67 +msgid "" +"Search by missed call\n" +"Click here to change the search type" +msgstr "" + +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:79 +msgid "" +"Search by incoming call\n" +"Click here to change the search type" +msgstr "" + +#: ../../sflphone-client-gnome/src/contacts/searchbar.c:91 +msgid "" +"Search by outgoing call\n" +"Click here to change the search type" +msgstr "" + +#~ msgid "Accept" +#~ msgstr "接受" + +#~ msgid "Refuse" +#~ msgstr "拒絕" + +#~ msgid "Ignore" +#~ msgstr "忽略" + +#~ msgid "<small>Missed call</small>" +#~ msgstr "<small>未接電話</small>" + +#~ msgid "<small>Duration:</small> %s" +#~ msgstr "<small>時長:</small> %s" + +#~ msgid "Fields" +#~ msgstr "字段" + +#~ msgid "_History size limit" +#~ msgstr "歷史記錄上限(H)" + +#~ msgid "" +#~ "SFLphone can run custom commands if incoming calls come with an URL " +#~ "attached.\n" +#~ "In this case, %s will be replaced with the passed URL." +#~ msgstr "" +#~ "當來電有附加的URL時,SFLphone可運行客戶命令.\n" +#~ "在此情況下,傳輸的URL會被替換成%s." + +#~ msgid "Search history" +#~ msgstr "搜尋歷史記錄" -#: ../../sflphone-client-gnome/src/contacts/history.c:83 -#: ../../sflphone-client-gnome/src/contacts/searchbar.c:110 -msgid "Search contact" -msgstr "搜尋聯繫人(S)" +#~ msgid "Search contact" +#~ msgstr "搜尋聯繫人(S)" #~ msgid "Registered to %s (%s)" #~ msgstr "註冊到 %s (%s)" diff --git a/sflphone-common/src/Makefile.am b/sflphone-common/src/Makefile.am index 7a4db6ab79cd5bda1986fe2d4bfd08d17d00e1d0..74cb553b3ece79c0fe0391dbafd697eec87af4c5 100644 --- a/sflphone-common/src/Makefile.am +++ b/sflphone-common/src/Makefile.am @@ -1,6 +1,8 @@ include ../globals.mak -bin_PROGRAMS = sflphoned +libexecdir=$(libdir)/sflphone +libexec_PROGRAMS = sflphoned + if USE_IAX # Use the global instead of locally built diff --git a/sflphone-common/src/dbus/Makefile.am b/sflphone-common/src/dbus/Makefile.am index b94bdbaea5455df9a88db9b760be3d786483e6ad..5a2745e257f0048291d1b6e60bf1fdb2d9b2e159 100644 --- a/sflphone-common/src/dbus/Makefile.am +++ b/sflphone-common/src/dbus/Makefile.am @@ -38,7 +38,7 @@ service_DATA = $(service_in_files:.service.in=.service) # Rule to make the service file with bindir expanded $(service_DATA): $(service_in_files) Makefile - sed -e "s|bindir|$(prefix)/bin|" $<> $@ + sed -e "s|libexec|$(prefix)/lib/sflphone|" $<> $@ EXTRA_DIST = *.xml README diff --git a/sflphone-common/src/dbus/configurationmanager-introspec.xml b/sflphone-common/src/dbus/configurationmanager-introspec.xml index 05e6d554c3aef376d5592d3c3eb99ed37b253d41..7e3888c2338960ea9c20d4d0d7e0fed94c09a4cf 100644 --- a/sflphone-common/src/dbus/configurationmanager-introspec.xml +++ b/sflphone-common/src/dbus/configurationmanager-introspec.xml @@ -310,7 +310,7 @@ </method> <method name="getHistory"> - <annotation name="com.trolltech.QtDBus.QtTypeName.In0" value="MapStringString"/> + <annotation name="com.trolltech.QtDBus.QtTypeName.Out0" value="MapStringString"/> <arg type="a{ss}" name="entries" direction="out"/> </method> diff --git a/sflphone-common/src/dbus/org.sflphone.SFLphone.service.in b/sflphone-common/src/dbus/org.sflphone.SFLphone.service.in index 031173b777cc5a516d135beb81ebd312322f860e..b319dd220161c1133bd7afa711ec843b565fb828 100644 --- a/sflphone-common/src/dbus/org.sflphone.SFLphone.service.in +++ b/sflphone-common/src/dbus/org.sflphone.SFLphone.service.in @@ -1,3 +1,3 @@ [D-BUS Service] Name=org.sflphone.SFLphone -Exec=bindir/sflphoned +Exec=libexec/sflphoned diff --git a/sflphone-common/src/managerimpl.cpp b/sflphone-common/src/managerimpl.cpp index e5f8a3a59ef0471d7b3036cd30877a8b8ca5f72a..681a61aa740568402eb6cd4fb2b7292e9b70c099 100644 --- a/sflphone-common/src/managerimpl.cpp +++ b/sflphone-common/src/managerimpl.cpp @@ -2861,7 +2861,7 @@ std::map< std::string, std::string > ManagerImpl::getCallDetails(const CallID& c AccountID accountid; Account *account; VoIPLink *link; - Call *call; + Call *call = NULL; std::stringstream type; @@ -2875,17 +2875,13 @@ std::map< std::string, std::string > ManagerImpl::getCallDetails(const CallID& c // Then the VoIP link this account is linked with (IAX2 or SIP) if ( (account=getAccount (accountid)) != 0) { link = account->getVoIPLink (); - if (link) { call = link->getCall (callID); } - } - if (call) { type << call->getCallType () << std::endl; - call_details.insert (std::pair<std::string, std::string> ("ACCOUNTID", accountid)); call_details.insert (std::pair<std::string, std::string> ("PEER_NUMBER", call->getPeerNumber ())); call_details.insert (std::pair<std::string, std::string> ("PEER_NAME", call->getPeerName ())); @@ -2898,10 +2894,9 @@ std::map< std::string, std::string > ManagerImpl::getCallDetails(const CallID& c call_details.insert (std::pair<std::string, std::string> ("ACCOUNTID", AccountNULL)); call_details.insert (std::pair<std::string, std::string> ("PEER_NUMBER", "Unknown")); call_details.insert (std::pair<std::string, std::string> ("PEER_NAME", "Unknown")); - call_details.insert (std::pair<std::string, std::string> ("CALL_STATE", "FAILURE")); + call_details.insert (std::pair<std::string, std::string> ("CALL_STATE", "UNKNOWN")); call_details.insert (std::pair<std::string, std::string> ("CALL_TYPE", "0")); } - return call_details; } diff --git a/sflphone-common/src/voiplink.cpp b/sflphone-common/src/voiplink.cpp index 77a0c95ed11f7cc05646e0baa21a311501310ab8..825edac881da94cfe3dbdb2c1b828cd5b56ea220 100644 --- a/sflphone-common/src/voiplink.cpp +++ b/sflphone-common/src/voiplink.cpp @@ -36,7 +36,7 @@ VoIPLink::~VoIPLink (void) bool VoIPLink::addCall(Call* call) { if (call) { - if (getCall(call->getCallId()) == 0) { + if (getCall(call->getCallId()) == NULL) { ost::MutexLock m(_callMapMutex); _callMap[call->getCallId()] = call; } @@ -60,7 +60,7 @@ Call* VoIPLink::getCall(const CallID& id) if ( iter != _callMap.end() ) { return iter->second; } - return 0; + return NULL; } bool VoIPLink::clearCallMap() diff --git a/sflphone-common/test/Makefile.am b/sflphone-common/test/Makefile.am index 72a2003cfe0a2e581eb09d3b81a0c8705273a757..bd6654596bf6cf0ed9ba584eba5b5bb208a7bec6 100644 --- a/sflphone-common/test/Makefile.am +++ b/sflphone-common/test/Makefile.am @@ -1,6 +1,6 @@ include ../globals.mak -bin_PROGRAMS = numbercleanerTester pluginmanagerTester hookmanagerTester audiolayerTester rtpTester historyTester +noinst_PROGRAMS = numbercleanerTester pluginmanagerTester hookmanagerTester audiolayerTester rtpTester historyTester OBJECT_FILES= \ ../src/sflphoned-managerimpl.o \ diff --git a/sflphone-common/test/sflphonedrc-sample b/sflphone-common/test/sflphonedrc-sample new file mode 100644 index 0000000000000000000000000000000000000000..6d0064a7c50fc350fb1d55aa1faef4002c321427 --- /dev/null +++ b/sflphone-common/test/sflphonedrc-sample @@ -0,0 +1,74 @@ +[Account:1239059899] +Account.alias=1260@sip.sflphone.org +Account.enable=1 +Account.type=SIP +hostname=sflphone.org +password=NIPAgmLo +username=1260 + +[Account:1243544046] +Account.alias=Manu +Account.enable=1 +Account.mailbox=*97 +Account.type=SIP +hostname=192.168.50.3 +password=sfl-137pw +username=137 + +[Addressbook] +Addressbook.contact_photo=0 +Addressbook.enable=1 +Addressbook.list=1243608768.30329.0@emilou-desktop/1243456917.15690.23@emilou-desktop/ +Addressbook.max_results=25 +Addressbook.phone_business=1 +Addressbook.phone_home=0 +Addressbook.phone_mobile=0 + +[Audio] +Alsa.cardID_In=0 +Alsa.cardID_Out=0 +Alsa.framesize=20 +Alsa.plugin=default +Alsa.sampleRate=44100 +Record.path=/home/emilou +Rings.ringChoice=/usr/share/sflphone/ringtones/konga.ul +Volume.micro=100 +Volume.speakers=100 + +[Hooks] +Hooks.iax2_enabled=0 +Hooks.phone_number_add_prefix= +Hooks.phone_number_enabled=0 +Hooks.sip_enabled=0 +Hooks.url_command=x-www-browser +Hooks.url_sip_field=X-sflphone-url + +[Preferences] +Accounts.order=Account:1243544046/Account:1239138829/ +Audio.api=1 +Dialpad.display=0 +History.enabled=1 +History.limit=30 +History.maxCalls=20 +Notify.all=1 +Notify.mails=0 +Options.zoneToneChoice=North America +Pulseaudio.volumeCtrl=1 +Registration.expire=180 +Ringtones.enable=1 +SIP.portNum=5060 +Searchbar.display=1 +Start.hidden=0 +Volume.display=0 +Window.popup=0 +Zeroconf.enable=0 + +[VoIPLink] +DTMF.playDtmf=1 +DTMF.playTones=1 +DTMF.pulseLength=250 +DTMF.sendDTMFas=0 +STUN.enable=0 +STUN.server=stun.sflphone.org +VoIPLink.symmetric=1 +