Skip to content

Commit 3992861

Browse files
author
Redmer Loen
committed
Upgrade to PJSIP 2.7.1
1 parent c117e0a commit 3992861

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+723
-91
lines changed

Diff for: ‎.gitattributes

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

Diff for: ‎Pod/VialerPJSIP.a

-96.9 MB
Binary file not shown.

Diff for: ‎Pod/vialer-pjsip-include/openssl/opensslconf_ios_arm64.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ extern "C" {
119119

120120
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
121121
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
122-
#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-arm64.sdk/lib/engines"
123-
#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-arm64.sdk"
122+
#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-arm64.sdk/lib/engines"
123+
#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-arm64.sdk"
124124
#endif
125125
#endif
126126

Diff for: ‎Pod/vialer-pjsip-include/openssl/opensslconf_ios_armv7.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ extern "C" {
119119

120120
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
121121
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
122-
#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-armv7.sdk/lib/engines"
123-
#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-armv7.sdk"
122+
#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-armv7.sdk/lib/engines"
123+
#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-armv7.sdk"
124124
#endif
125125
#endif
126126

Diff for: ‎Pod/vialer-pjsip-include/openssl/opensslconf_ios_armv7s.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ extern "C" {
119119

120120
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
121121
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
122-
#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-armv7s.sdk/lib/engines"
123-
#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.0-armv7s.sdk"
122+
#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-armv7s.sdk/lib/engines"
123+
#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneOS11.1-armv7s.sdk"
124124
#endif
125125
#endif
126126

Diff for: ‎Pod/vialer-pjsip-include/openssl/opensslconf_ios_i386.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ extern "C" {
119119

120120
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
121121
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
122-
#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.0-i386.sdk/lib/engines"
123-
#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.0-i386.sdk"
122+
#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.1-i386.sdk/lib/engines"
123+
#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.1-i386.sdk"
124124
#endif
125125
#endif
126126

Diff for: ‎Pod/vialer-pjsip-include/openssl/opensslconf_ios_x86_64.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ extern "C" {
122122

123123
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
124124
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
125-
#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.0-x86_64.sdk/lib/engines"
126-
#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.0-x86_64.sdk"
125+
#define ENGINESDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.1-x86_64.sdk/lib/engines"
126+
#define OPENSSLDIR "/Users/redmerloen/Programming/Vialer/iOS/Vialer-pjsip-iOS/pjsip/external/ssl/bin/iPhoneSimulator11.1-x86_64.sdk"
127127
#endif
128128
#endif
129129

Diff for: ‎Pod/vialer-pjsip-include/pj/compat/limits.h

+65
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
/* $Id: limits.h 5682 2017-11-08 02:58:18Z riza $ */
2+
/*
3+
* Copyright (C) 2017 Teluu Inc. (http://www.teluu.com)
4+
* Copyright (C) 2017 George Joseph <[email protected]>
5+
*
6+
* This program is free software; you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation; either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19+
*/
20+
#ifndef __PJ_COMPAT_LIMITS_H__
21+
#define __PJ_COMPAT_LIMITS_H__
22+
23+
/**
24+
* @file limits.h
25+
* @brief Provides integer limits normally found in limits.h.
26+
*/
27+
28+
#if defined(PJ_HAS_LIMITS_H) && PJ_HAS_LIMITS_H != 0
29+
# include <limits.h>
30+
#else
31+
32+
# ifdef _MSC_VER
33+
# pragma message("limits.h is not found or not supported. LONG_MIN and "\
34+
"LONG_MAX will be defined by the library in "\
35+
"pj/compats/limits.h and overridable in config_site.h")
36+
# else
37+
# warning "limits.h is not found or not supported. LONG_MIN and LONG_MAX " \
38+
"will be defined by the library in pj/compats/limits.h and "\
39+
"overridable in config_site.h"
40+
# endif
41+
42+
/* Minimum and maximum values a `signed long int' can hold. */
43+
# ifndef LONG_MAX
44+
# if __WORDSIZE == 64
45+
# define LONG_MAX 9223372036854775807L
46+
# else
47+
# define LONG_MAX 2147483647L
48+
# endif
49+
# endif
50+
51+
# ifndef LONG_MIN
52+
# define LONG_MIN (-LONG_MAX - 1L)
53+
# endif
54+
55+
/* Maximum value an `unsigned long int' can hold. (Minimum is 0.) */
56+
# ifndef ULONG_MAX
57+
# if __WORDSIZE == 64
58+
# define ULONG_MAX 18446744073709551615UL
59+
# else
60+
# define ULONG_MAX 4294967295UL
61+
# endif
62+
# endif
63+
#endif
64+
65+
#endif /* __PJ_COMPAT_LIMITS_H__ */

Diff for: ‎Pod/vialer-pjsip-include/pj/compat/os_win32.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: os_win32.h 3553 2011-05-05 06:14:19Z nanang $ */
1+
/* $Id: os_win32.h 5682 2017-11-08 02:58:18Z riza $ */
22
/*
33
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
44
* Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -57,6 +57,7 @@
5757
#define PJ_HAS_SYS_TYPES_H 1
5858
#define PJ_HAS_TIME_H 1
5959
#define PJ_HAS_UNISTD_H 0
60+
#define PJ_HAS_LIMITS_H 1
6061

6162
#define PJ_HAS_MSWSOCK_H 1
6263
#define PJ_HAS_WINSOCK_H 0

Diff for: ‎Pod/vialer-pjsip-include/pj/config.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: config.h 5661 2017-09-25 04:20:21Z ming $ */
1+
/* $Id: config.h 5683 2017-11-08 03:03:22Z ming $ */
22
/*
33
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
44
* Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -1293,7 +1293,7 @@ PJ_BEGIN_DECL
12931293
#define PJ_VERSION_NUM_MINOR 7
12941294

12951295
/** PJLIB version revision number. */
1296-
#define PJ_VERSION_NUM_REV 0
1296+
#define PJ_VERSION_NUM_REV 1
12971297

12981298
/**
12991299
* Extra suffix for the version (e.g. "-trunk"), or empty for

Diff for: ‎Pod/vialer-pjsip-include/pj/limits.h

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
/* $Id: limits.h 5682 2017-11-08 02:58:18Z riza $ */
2+
/*
3+
* Copyright (C) 2017 Teluu Inc. (http://www.teluu.com)
4+
* Copyright (C) 2017 George Joseph <[email protected]>
5+
*
6+
* This program is free software; you can redistribute it and/or modify
7+
* it under the terms of the GNU General Public License as published by
8+
* the Free Software Foundation; either version 2 of the License, or
9+
* (at your option) any later version.
10+
*
11+
* This program is distributed in the hope that it will be useful,
12+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
13+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14+
* GNU General Public License for more details.
15+
*
16+
* You should have received a copy of the GNU General Public License
17+
* along with this program; if not, write to the Free Software
18+
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19+
*/
20+
#ifndef __PJ_LIMITS_H__
21+
#define __PJ_LIMITS_H__
22+
23+
/**
24+
* @file limits.h
25+
* @brief Common min and max values
26+
*/
27+
28+
#include <pj/compat/limits.h>
29+
30+
/** Maximum value for signed 32-bit integer. */
31+
#define PJ_MAXINT32 0x7fffffff
32+
33+
/** Minimum value for signed 32-bit integer. */
34+
#define PJ_MININT32 0x80000000
35+
36+
/** Maximum value for unsigned 16-bit integer. */
37+
#define PJ_MAXUINT16 0xffff
38+
39+
/** Maximum value for unsigned char. */
40+
#define PJ_MAXUINT8 0xff
41+
42+
/** Maximum value for long. */
43+
#define PJ_MAXLONG LONG_MAX
44+
45+
/** Minimum value for long. */
46+
#define PJ_MINLONG LONG_MIN
47+
48+
/** Minimum value for unsigned long. */
49+
#define PJ_MAXULONG ULONG_MAX
50+
51+
#endif /* __PJ_LIMITS_H__ */

Diff for: ‎Pod/vialer-pjsip-include/pj/string.h

+45-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: string.h 5520 2017-01-11 04:38:29Z riza $ */
1+
/* $Id: string.h 5682 2017-11-08 02:58:18Z riza $ */
22
/*
33
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
44
* Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -28,7 +28,6 @@
2828
#include <pj/types.h>
2929
#include <pj/compat/string.h>
3030

31-
3231
PJ_BEGIN_DECL
3332

3433
/**
@@ -635,6 +634,29 @@ PJ_DECL(char*) pj_create_random_string(char *str, pj_size_t length);
635634
*/
636635
PJ_DECL(long) pj_strtol(const pj_str_t *str);
637636

637+
/**
638+
* Convert string to signed long integer. The conversion will stop as
639+
* soon as non-digit character is found or all the characters have
640+
* been processed.
641+
*
642+
* @param str the string.
643+
* @param value Pointer to a long to receive the value.
644+
*
645+
* @return PJ_SUCCESS if successful. Otherwise:
646+
* PJ_ETOOSMALL if the value was an impossibly long negative number.
647+
* In this case *value will be set to LONG_MIN.
648+
* \n
649+
* PJ_ETOOBIG if the value was an impossibly long positive number.
650+
* In this case, *value will be set to LONG_MAX.
651+
* \n
652+
* PJ_EINVAL if the input string was NULL, the value pointer was NULL
653+
* or the input string could not be parsed at all such as starting with
654+
* a character other than a '+', '-' or not in the '0' - '9' range.
655+
* In this case, *value will be left untouched.
656+
*/
657+
PJ_DECL(pj_status_t) pj_strtol2(const pj_str_t *str, long *value);
658+
659+
638660
/**
639661
* Convert string to unsigned integer. The conversion will stop as
640662
* soon as non-digit character is found or all the characters have
@@ -663,6 +685,27 @@ PJ_DECL(unsigned long) pj_strtoul(const pj_str_t *str);
663685
PJ_DECL(unsigned long) pj_strtoul2(const pj_str_t *str, pj_str_t *endptr,
664686
unsigned base);
665687

688+
/**
689+
* Convert string to unsigned long integer. The conversion will stop as
690+
* soon as non-digit character is found or all the characters have
691+
* been processed.
692+
*
693+
* @param str The input string.
694+
* @param value Pointer to an unsigned long to receive the value.
695+
* @param base Number base to use.
696+
*
697+
* @return PJ_SUCCESS if successful. Otherwise:
698+
* PJ_ETOOBIG if the value was an impossibly long positive number.
699+
* In this case, *value will be set to ULONG_MAX.
700+
* \n
701+
* PJ_EINVAL if the input string was NULL, the value pointer was NULL
702+
* or the input string could not be parsed at all such as starting
703+
* with a character outside the base character range. In this case,
704+
* *value will be left untouched.
705+
*/
706+
PJ_DECL(pj_status_t) pj_strtoul3(const pj_str_t *str, unsigned long *value,
707+
unsigned base);
708+
666709
/**
667710
* Convert string to float.
668711
*
@@ -786,7 +829,6 @@ PJ_INLINE(void*) pj_memchr(const void *buf, int c, pj_size_t size)
786829
return (void*)memchr((void*)buf, c, size);
787830
}
788831

789-
790832
/**
791833
* @}
792834
*/

Diff for: ‎Pod/vialer-pjsip-include/pj/types.h

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: types.h 4704 2014-01-16 05:30:46Z ming $ */
1+
/* $Id: types.h 5682 2017-11-08 02:58:18Z riza $ */
22
/*
33
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
44
* Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -280,9 +280,6 @@ typedef int pj_exception_id_t;
280280
/** Utility macro to compute the number of elements in static array. */
281281
#define PJ_ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0]))
282282

283-
/** Maximum value for signed 32-bit integer. */
284-
#define PJ_MAXINT32 0x7FFFFFFFL
285-
286283
/**
287284
* Length of object names.
288285
*/

Diff for: ‎Pod/vialer-pjsip-include/pjmedia/audiodev.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: audiodev.h 5430 2016-08-25 03:28:54Z ming $ */
1+
/* $Id: audiodev.h 5677 2017-10-27 06:30:50Z ming $ */
22
/*
33
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
44
* Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -49,7 +49,7 @@ typedef pj_int32_t pjmedia_aud_dev_index;
4949
/**
5050
* Device index constants.
5151
*/
52-
enum
52+
typedef enum pjmedia_aud_dev_id
5353
{
5454
/**
5555
* Constant to denote default capture device
@@ -65,7 +65,7 @@ enum
6565
* Constant to denote invalid device index.
6666
*/
6767
PJMEDIA_AUD_INVALID_DEV = -3
68-
};
68+
} pjmedia_aud_dev_id;
6969

7070

7171
#define PJMEDIA_AUD_MAX_DRIVERS 16

Diff for: ‎Pod/vialer-pjsip-include/pjsip/sip_config.h

+11-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: sip_config.h 5557 2017-02-20 01:23:54Z ming $ */
1+
/* $Id: sip_config.h 5668 2017-09-29 02:43:05Z ming $ */
22
/*
33
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
44
* Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -376,6 +376,16 @@ PJ_INLINE(pjsip_cfg_t*) pjsip_cfg(void)
376376
# define PJSIP_DONT_SWITCH_TO_TLS 0
377377
#endif
378378

379+
/**
380+
* Specify if #pjsip_endpt_handle_events() should sleep if ioqueue poll
381+
* returns error.
382+
*
383+
* Default is 1 (yes).
384+
*/
385+
386+
#ifndef PJSIP_HANDLE_EVENTS_HAS_SLEEP_ON_ERR
387+
# define PJSIP_HANDLE_EVENTS_HAS_SLEEP_ON_ERR 1
388+
#endif
379389

380390
/**
381391
* Specify whether the call media session should be updated to the latest

Diff for: ‎Pod/vialer-pjsip-include/pjsip/sip_parser.h

+26-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $Id: sip_parser.h 4445 2013-03-20 11:29:08Z nanang $ */
1+
/* $Id: sip_parser.h 5682 2017-11-08 02:58:18Z riza $ */
22
/*
33
* Copyright (C) 2008-2011 Teluu Inc. (http://www.teluu.com)
44
* Copyright (C) 2003-2008 Benny Prijono <[email protected]>
@@ -38,6 +38,26 @@ PJ_BEGIN_DECL
3838
* @{
3939
*/
4040

41+
/**
42+
* Contants for limit checks
43+
*/
44+
#define PJSIP_MIN_CONTENT_LENGTH 0
45+
#define PJSIP_MAX_CONTENT_LENGTH PJ_MAXINT32
46+
#define PJSIP_MIN_PORT 0
47+
#define PJSIP_MAX_PORT PJ_MAXUINT16
48+
#define PJSIP_MIN_TTL 0
49+
#define PJSIP_MAX_TTL PJ_MAXUINT8
50+
#define PJSIP_MIN_STATUS_CODE 100
51+
#define PJSIP_MAX_STATUS_CODE 999
52+
#define PJSIP_MIN_Q1000 0
53+
#define PJSIP_MAX_Q1000 PJ_MAXINT32 / 1000
54+
#define PJSIP_MIN_EXPIRES 0
55+
#define PJSIP_MAX_EXPIRES PJ_MAXINT32
56+
#define PJSIP_MIN_CSEQ 0
57+
#define PJSIP_MAX_CSEQ PJ_MAXINT32
58+
#define PJSIP_MIN_RETRY_AFTER 0
59+
#define PJSIP_MAX_RETRY_AFTER PJ_MAXINT32
60+
4161
/**
4262
* URI Parsing options.
4363
*/
@@ -63,6 +83,11 @@ enum
6383
*/
6484
extern int PJSIP_SYN_ERR_EXCEPTION;
6585

86+
/**
87+
* Invalid value error exception value.
88+
*/
89+
extern int PJSIP_EINVAL_ERR_EXCEPTION;
90+
6691
/**
6792
* This structure is used to get error reporting from parser.
6893
*/

0 commit comments

Comments
 (0)