Merge branch 'release/3.2.0'

.gitattributes

@@ -0,0 +1,2 @@
+*.a filter=lfs diff=lfs merge=lfs -text
+VialerPJSIP.framework/Versions/A/VialerPJSIP filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,23 @@
+### Version
+
+{version or tag here}
+
+### File / Feature
+
+{file or feature containing the issue}
+
+### Expected behaviour
+
+{what should happen}
+
+### Actual behaviour
+
+{what happens}
+
+### Stacktrace / Error message
+
+{paste here}
+
+### Other info
+
+{anything else that might be related/useful}

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,19 @@
+### Issue number
+
+{if exists provide related issue}
+
+### Expected behaviour
+
+{what should have happened}
+
+### Actual behaviour
+
+{what happens}
+
+### Description of fix
+
+{small description of what fixes the issue}
+
+### Other info
+
+{anything else that might be related/useful}

CHANGELOG.md

@@ -3,9 +3,18 @@ All notable changes to this project will be documented in this file.
 
 ---
 
+## [3.2.0](https://github.com/VoIPGRID/Vialer-pjsip-iOS/tree/3.2.0) (20/11/2017)
+Released on Monday, November 20, 2017
+* Updated PJSIP to 2.7.1
+* Flag when compiling to ignore libsrtp when there is an independent webrtc build
+
+## [3.1.0](https://github.com/VoIPGRID/Vialer-pjsip-iOS/tree/3.1.0) (20/10/2017)
+Released on Friday, October 20, 2017
+* Added the possibility to also use ZRTP
+
 ## [3.0.0](https://github.com/VoIPGRID/Vialer-pjsip-iOS/tree/3.0.0) (12/10/2017)
 Released on Thursday, October 12, 2017
-* Update to PJSIP to release 2.7
+* Updated to PJSIP to release 2.7
 
 ## [2.0.1](https://github.com/VoIPGRID/Vialer-pjsip-iOS/tree/2.0.1) (16/02/2017)
 Released on Thursday, February 16, 2017

CONTRIBUTING.md

@@ -0,0 +1,27 @@
+# Contributing
+Nice having you onboard!
+
+We love contributions from everyone and here are a few things to keep in mind when contributing.
+
+## Issues
+Somethings not working like it should? We've got you covered!
+
+ * Use github to create an issue;
+ * Write a descriptive title;
+ * Fill out the issue template;
+ * Wait for a developer to make coffee and get back to you;
+
+## Pull requests
+You want to help out by contributing code? Here's a checklist for a pull request:
+
+ * Fork the project;
+ * Create a branch for your code;
+ * Write your awesome code;
+ * Adhere to the coding style guide {insert link to styleguide here};
+ * Make sure all tests pass {insert how to run tests here};
+ * Don't forget to add yourself to the [CONTRIBUTORS.md](CONTRIBUTORS.md) file;
+ * Squash commits and provide a sane commit message;
+ * Create a pull request;
+ * Write a descriptive title;
+ * Fill out the pull request template;
+ * Wait for a developer to make coffee and get back to you;

CONTRIBUTORS.md

@@ -0,0 +1,37 @@
+Credits & Contributions
+=======================
+
+We would really like to have you involved in the project. Please contact us at [email protected], or create a pull request. Contributors will be added to this page.
+
+#### Credits
+
+This project wouldn't exist without the work of others. We love the open source community and what it creates. We want to give a big shout out to the people who inspired us to create this library.
+
+##### PJSIP
+
+What is a wrapper without the code it surrounds? Thanks [PJSIP](http://www.pjsip.org/).
+
+#### Contributions
+
+##### Astral Vision
+
+Astral Vision helped us to create the very first version of our app and created the first implementation of Gossip/PJSIP in our app. Thanks [Astral Vision](http://astralvision.nl/).
+
+##### Peperzaken
+
+Peperzaken helped to get a big update on the app and created the first version of our Middleware. Thanks [Peperzaken](https://www.peperzaken.com/).
+
+##### Devhouse Spindle
+
+We're proud off the work we do at Devhouse Spindle. We love to create open source projects and make bussiness communication a little more beautiful with every commit. Please visit [our website](https://wearespindle.com) to get an overview of our recent projects.
+
+- Redmer Loen (https://github.com/spindleredmer)
+
+##### Github users
+
+We think it is amazing that others are using our library to bring PJSIP to their projects. Every contribution that is made to the project deserves credits. These are the people that have contributed:
+
+- Harold Dijkstra (https://github.com/r3b3l)
+- Bob Voorneveld (https://github.com/bobvoorneveld)
+- Smolskyaleksey (https://github.com/smolskyaleksey)
+- LuoLee (https://github.com/LuoLee)

Pod/vialer-pjsip-include/openssl/opensslconf_ios_arm64.h

@@ -119,8 +119,8 @@ extern "C" {
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-arm64.sdk/lib/engines"
-#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-arm64.sdk"
+#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-arm64.sdk/lib/engines"
+#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-arm64.sdk"
 #endif
 #endif
 

Pod/vialer-pjsip-include/openssl/opensslconf_ios_armv7.h

@@ -119,8 +119,8 @@ extern "C" {
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-armv7.sdk/lib/engines"
-#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-armv7.sdk"
+#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-armv7.sdk/lib/engines"
+#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-armv7.sdk"
 #endif
 #endif
 

Pod/vialer-pjsip-include/openssl/opensslconf_ios_armv7s.h

@@ -119,8 +119,8 @@ extern "C" {
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-armv7s.sdk/lib/engines"
-#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-armv7s.sdk"
+#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-armv7s.sdk/lib/engines"
+#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-armv7s.sdk"
 #endif
 #endif
 

Pod/vialer-pjsip-include/openssl/opensslconf_ios_i386.h

@@ -119,8 +119,8 @@ extern "C" {
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.0-i386.sdk/lib/engines"
-#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.0-i386.sdk"
+#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.1-i386.sdk/lib/engines"
+#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.1-i386.sdk"
 #endif
 #endif
 

Pod/vialer-pjsip-include/openssl/opensslconf_ios_x86_64.h

@@ -122,8 +122,8 @@ extern "C" {
 
 #if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
 #if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
-#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.0-x86_64.sdk/lib/engines"
-#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.0-x86_64.sdk"
+#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.1-x86_64.sdk/lib/engines"
+#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.1-x86_64.sdk"
 #endif
 #endif
 

Pod/vialer-pjsip-include/pj/compat/limits.h

@@ -0,0 +1,65 @@
+/* $Id: limits.h 5682 2017-11-08 02:58:18Z riza $ */
+/*
+ * Copyright (C) 2017 Teluu Inc. (http://www.teluu.com)
+ * Copyright (C) 2017 George Joseph <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+#ifndef __PJ_COMPAT_LIMITS_H__
+#define __PJ_COMPAT_LIMITS_H__
+
+/**
+ * @file limits.h
+ * @brief Provides integer limits normally found in limits.h.
+ */
+
+#if defined(PJ_HAS_LIMITS_H) && PJ_HAS_LIMITS_H != 0
+#  include <limits.h>
+#else
+
+#  ifdef _MSC_VER
+#  pragma message("limits.h is not found or not supported. LONG_MIN and "\
+		 "LONG_MAX will be defined by the library in "\
+		 "pj/compats/limits.h and overridable in config_site.h")
+#  else
+#  warning "limits.h is not found or not supported. LONG_MIN and LONG_MAX " \
+           "will be defined by the library in pj/compats/limits.h and "\
+           "overridable in config_site.h"
+#  endif
+
+/* Minimum and maximum values a `signed long int' can hold.  */
+#  ifndef LONG_MAX
+#    if __WORDSIZE == 64
+#      define LONG_MAX     9223372036854775807L
+#    else
+#      define LONG_MAX     2147483647L
+#    endif
+#  endif
+
+#  ifndef LONG_MIN
+#    define LONG_MIN      (-LONG_MAX - 1L)
+#  endif
+
+/* Maximum value an `unsigned long int' can hold.  (Minimum is 0.)  */
+#  ifndef ULONG_MAX
+#    if __WORDSIZE == 64
+#      define ULONG_MAX    18446744073709551615UL
+#    else    
+#      define ULONG_MAX    4294967295UL
+#    endif
+#  endif
+#endif
+
+#endif  /* __PJ_COMPAT_LIMITS_H__ */

Pod/vialer-pjsip-include/pj/compat/os_win32.h

@@ -1,4 +1,4 @@
-/* $Id: os_win32.h 3553 2011-05-05 06:14:19Z nanang $ */
+/* $Id: os_win32.h 5682 2017-11-08 02:58:18Z riza $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -57,6 +57,7 @@
 #define PJ_HAS_SYS_TYPES_H	    1
 #define PJ_HAS_TIME_H		    1
 #define PJ_HAS_UNISTD_H		    0
+#define PJ_HAS_LIMITS_H		    1
 
 #define PJ_HAS_MSWSOCK_H	    1
 #define PJ_HAS_WINSOCK_H	    0

Pod/vialer-pjsip-include/pj/config.h

@@ -1,4 +1,4 @@
-/* $Id: config.h 5661 2017-09-25 04:20:21Z ming $ */
+/* $Id: config.h 5683 2017-11-08 03:03:22Z ming $ */
 /* 
  * Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
  * Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -1293,7 +1293,7 @@ PJ_BEGIN_DECL
 #define PJ_VERSION_NUM_MINOR	7
 
 /** PJLIB version revision number. */
-#define PJ_VERSION_NUM_REV	0
+#define PJ_VERSION_NUM_REV	1
 
 /**
  * Extra suffix for the version (e.g. "-trunk"), or empty for

Pod/vialer-pjsip-include/pj/limits.h

@@ -0,0 +1,51 @@
+/* $Id: limits.h 5682 2017-11-08 02:58:18Z riza $ */
+/*
+ * Copyright (C) 2017 Teluu Inc. (http://www.teluu.com)
+ * Copyright (C) 2017 George Joseph <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
+ */
+#ifndef __PJ_LIMITS_H__
+#define __PJ_LIMITS_H__
+
+/**
+ * @file limits.h
+ * @brief Common min and max values
+ */
+
+#include <pj/compat/limits.h>
+
+/** Maximum value for signed 32-bit integer. */
+#define PJ_MAXINT32	0x7fffffff
+
+/** Minimum value for signed 32-bit integer. */
+#define PJ_MININT32	0x80000000
+
+/** Maximum value for unsigned 16-bit integer. */
+#define PJ_MAXUINT16	0xffff
+
+/** Maximum value for unsigned char. */
+#define PJ_MAXUINT8	0xff
+
+/** Maximum value for long. */
+#define PJ_MAXLONG	LONG_MAX
+
+/** Minimum value for long. */
+#define PJ_MINLONG	LONG_MIN
+
+/** Minimum value for unsigned long. */
+#define PJ_MAXULONG	ULONG_MAX
+
+#endif  /* __PJ_LIMITS_H__ */