Merge pull request #440 from jslachta/asterisk-13-removal-1907
asterisk-13.x: move package to abandoned packages
This commit is contained in:
commit
956289cb10
21 changed files with 0 additions and 1544 deletions
|
@ -1,77 +0,0 @@
|
|||
#
|
||||
# Copyright (C) 2018 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=asterisk13-chan-lantiq
|
||||
PKG_VERSION:=20180215
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
|
||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||
PKG_SOURCE_VERSION:=f0d7ca7df8e5df802c5bcb79643e3bdc3956c190
|
||||
PKG_MIRROR_HASH:=aaf5ce87a2e23b801318add79eaaa1b7c4a8aa497ca8e2a71ef5d452a7595a73
|
||||
PKG_SOURCE_PROTO:=git
|
||||
|
||||
PKG_LICENSE:=GPL-2.0
|
||||
|
||||
PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
|
||||
|
||||
PKG_FLAGS:=nonshared
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
define Package/$(PKG_NAME)
|
||||
SUBMENU:=Telephony Lantiq
|
||||
SECTION:=net
|
||||
CATEGORY:=Network
|
||||
TITLE:=Lantiq channel driver
|
||||
URL:=https://github.com/kochstefan/asterisk_channel_lantiq
|
||||
DEPENDS:=+asterisk13 +kmod-ltq-vmmc
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/description
|
||||
An implementation of a Lantiq TAPI channel driver for Asterisk 13.
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/conffiles
|
||||
/etc/asterisk/lantiq.conf
|
||||
endef
|
||||
|
||||
define Build/Prepare
|
||||
$(call Build/Prepare/Default)
|
||||
$(INSTALL_DATA) ./files/default.exports \
|
||||
$(PKG_BUILD_DIR)/src/channels/chan_lantiq.exports
|
||||
endef
|
||||
|
||||
define Build/Compile
|
||||
cd $(PKG_BUILD_DIR)/src/channels && \
|
||||
$(TARGET_CC) -o chan_lantiq.o -c chan_lantiq.c -MD -MT chan_lantiq.o \
|
||||
-MF .chan_lantiq.o.d -MP -pthread \
|
||||
$(TARGET_CFLAGS) -DAST_MODULE_SELF_SYM=__internal_chan_lantiq_self \
|
||||
-I$(STAGING_DIR)/usr/include/asterisk-13/include \
|
||||
$(TARGET_CPPFLAGS) \
|
||||
-Wall -Wstrict-prototypes -Wmissing-prototypes \
|
||||
-Wmissing-declarations $(FPIC) -DAST_MODULE=\"chan_lantiq\" && \
|
||||
$(TARGET_CC) -o chan_lantiq.so -pthread $(TARGET_LDFLAGS) -shared \
|
||||
-Wl,--version-script,chan_lantiq.exports,--warn-common \
|
||||
chan_lantiq.o
|
||||
endef
|
||||
|
||||
define Package/$(PKG_NAME)/install
|
||||
$(INSTALL_DIR) $(1)/etc/asterisk
|
||||
$(INSTALL_CONF) \
|
||||
$(PKG_BUILD_DIR)/src/configs/samples/lantiq.conf.sample \
|
||||
$(1)/etc/asterisk/lantiq.conf
|
||||
$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
|
||||
$(INSTALL_BIN) \
|
||||
$(PKG_BUILD_DIR)/src/channels/chan_lantiq.so \
|
||||
$(1)/usr/lib/asterisk/modules
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,$(PKG_NAME)))
|
|
@ -1,8 +0,0 @@
|
|||
{
|
||||
global:
|
||||
/* See main/asterisk.exports.in for an explanation why this is
|
||||
* needed. */
|
||||
_IO_stdin_used;
|
||||
local:
|
||||
*;
|
||||
};
|
|
@ -1,11 +0,0 @@
|
|||
menu "Advanced configuration"
|
||||
depends on PACKAGE_asterisk13
|
||||
|
||||
config ASTERISK13_LOW_MEMORY
|
||||
bool "Optimize Asterisk 13 for low memory usage"
|
||||
default n
|
||||
help
|
||||
Warning: this feature is known to cause problems with some modules.
|
||||
Disable it if you experience problems like segmentation faults.
|
||||
|
||||
endmenu
|
File diff suppressed because it is too large
Load diff
|
@ -1,4 +0,0 @@
|
|||
## startup options for /etc/init.d/asterisk
|
||||
|
||||
ENABLE_ASTERISK="yes"
|
||||
OPTIONS=""
|
|
@ -1,33 +0,0 @@
|
|||
#!/bin/sh /etc/rc.common
|
||||
# Copyright (C) 2014 OpenWrt.org
|
||||
|
||||
START=99
|
||||
APP=asterisk
|
||||
OPTIONS=
|
||||
DEST=
|
||||
DEFAULT=$DEST/etc/default/$APP
|
||||
BIN_FILE=$DEST/usr/sbin/$APP
|
||||
PID_FILE=$DEST/var/run/$APP/$APP.pid
|
||||
|
||||
start() {
|
||||
[ -f $DEFAULT ] && . $DEFAULT
|
||||
[ -d $DEST/var/run/asterisk ] || mkdir -p $DEST/var/run/asterisk
|
||||
[ -d $DEST/var/log/asterisk ] || mkdir -p $DEST/var/log/asterisk
|
||||
[ -d $DEST/var/spool/asterisk ] || mkdir -p $DEST/var/spool/asterisk
|
||||
[ -d $DEST/var/lib/asterisk ] || mkdir -p $DEST/var/lib/asterisk
|
||||
[ -d $DEST/var/lib/asterisk/keys ] || mkdir -p $DEST/var/lib/asterisk/keys
|
||||
[ -d $DEST/var/log/asterisk/cdr-csv ] || mkdir -p $DEST/var/log/asterisk/cdr-csv
|
||||
|
||||
SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
|
||||
service_start $BIN_FILE $OPTIONS
|
||||
}
|
||||
|
||||
stop() {
|
||||
SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
|
||||
service_stop $BIN_FILE
|
||||
}
|
||||
|
||||
reload() {
|
||||
SERVICE_PID_FILE="/var/run/asterisk/asterisk.pid" \
|
||||
service_reload $BIN_FILE
|
||||
}
|
|
@ -1,22 +0,0 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1030,19 +1030,6 @@ AC_LINK_IFELSE(
|
||||
]
|
||||
)
|
||||
|
||||
-# Some platforms define sem_init(), but only support sem_open(). joyous.
|
||||
-AC_MSG_CHECKING(for working unnamed semaphores)
|
||||
-AC_RUN_IFELSE(
|
||||
- [AC_LANG_PROGRAM([#include <semaphore.h>],
|
||||
- [sem_t sem; return sem_init(&sem, 0, 0);])],
|
||||
- AC_MSG_RESULT(yes)
|
||||
- AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.]),
|
||||
- AC_MSG_RESULT(no),
|
||||
- AC_MSG_RESULT(cross-compile)
|
||||
- AC_MSG_NOTICE([WARNING: result yes guessed because of cross compilation])
|
||||
- AC_DEFINE([HAS_WORKING_SEMAPHORE], 1, [Define to 1 if anonymous semaphores work.])
|
||||
-)
|
||||
-
|
||||
LIBS="$save_LIBS"
|
||||
CFLAGS="$save_CFLAGS"
|
||||
if test "${ac_cv_pthread_rwlock_timedwrlock}" = "yes"; then
|
|
@ -1,10 +0,0 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1377,7 +1377,6 @@ AC_LINK_IFELSE(
|
||||
#include <resolv.h>],
|
||||
[int foo = res_ninit(NULL);])],
|
||||
AC_MSG_RESULT(yes)
|
||||
- AC_DEFINE([HAVE_RES_NINIT], 1, [Define to 1 if your system has the re-entrant resolver functions.])
|
||||
AC_SEARCH_LIBS(res_9_ndestroy, resolv)
|
||||
AC_MSG_CHECKING(for res_ndestroy)
|
||||
AC_LINK_IFELSE(
|
|
@ -1,101 +0,0 @@
|
|||
--- a/include/asterisk/lock.h
|
||||
+++ b/include/asterisk/lock.h
|
||||
@@ -51,9 +51,11 @@
|
||||
#include <pthread.h>
|
||||
#include <time.h>
|
||||
#include <sys/param.h>
|
||||
+#ifndef __UCLIBC__
|
||||
#ifdef HAVE_BKTR
|
||||
#include <execinfo.h>
|
||||
#endif
|
||||
+#endif
|
||||
|
||||
#ifndef HAVE_PTHREAD_RWLOCK_TIMEDWRLOCK
|
||||
#include "asterisk/time.h"
|
||||
@@ -86,11 +88,15 @@
|
||||
#define __AST_RWLOCK_INIT_VALUE {0}
|
||||
#endif /* HAVE_PTHREAD_RWLOCK_INITIALIZER */
|
||||
|
||||
+#ifndef __UCLIBC__
|
||||
#ifdef HAVE_BKTR
|
||||
#define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, {{{ 0 }}}, PTHREAD_MUTEX_INIT_VALUE }
|
||||
#else
|
||||
#define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, PTHREAD_MUTEX_INIT_VALUE }
|
||||
#endif
|
||||
+#else
|
||||
+#define AST_LOCK_TRACK_INIT_VALUE { { NULL }, { 0 }, 0, { NULL }, { 0 }, PTHREAD_MUTEX_INIT_VALUE }
|
||||
+#endif
|
||||
|
||||
#define AST_MUTEX_INIT_VALUE { PTHREAD_MUTEX_INIT_VALUE, NULL, {1, 0} }
|
||||
#define AST_MUTEX_INIT_VALUE_NOTRACKING { PTHREAD_MUTEX_INIT_VALUE, NULL, {0, 0} }
|
||||
@@ -114,9 +120,11 @@ struct ast_lock_track {
|
||||
int reentrancy;
|
||||
const char *func[AST_MAX_REENTRANCY];
|
||||
pthread_t thread_id[AST_MAX_REENTRANCY];
|
||||
+#ifndef __UCLIBC__
|
||||
#ifdef HAVE_BKTR
|
||||
struct ast_bt backtrace[AST_MAX_REENTRANCY];
|
||||
#endif
|
||||
+#endif
|
||||
pthread_mutex_t reentr_mutex;
|
||||
};
|
||||
|
||||
@@ -264,6 +272,7 @@ enum ast_lock_type {
|
||||
* on the lock. ast_mark_lock_acquired() will mark it as held by this thread.
|
||||
*/
|
||||
#if !defined(LOW_MEMORY)
|
||||
+#ifndef HAVE_BKTR
|
||||
#ifdef HAVE_BKTR
|
||||
void ast_store_lock_info(enum ast_lock_type type, const char *filename,
|
||||
int line_num, const char *func, const char *lock_name, void *lock_addr, struct ast_bt *bt);
|
||||
@@ -271,14 +280,22 @@ void ast_store_lock_info(enum ast_lock_t
|
||||
void ast_store_lock_info(enum ast_lock_type type, const char *filename,
|
||||
int line_num, const char *func, const char *lock_name, void *lock_addr);
|
||||
#endif /* HAVE_BKTR */
|
||||
+#else
|
||||
+void ast_store_lock_info(enum ast_lock_type type, const char *filename,
|
||||
+ int line_num, const char *func, const char *lock_name, void *lock_addr);
|
||||
+#endif
|
||||
|
||||
#else
|
||||
|
||||
+#ifndef __UCLIBC__
|
||||
#ifdef HAVE_BKTR
|
||||
#define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS,BUD)
|
||||
#else
|
||||
#define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS)
|
||||
#endif /* HAVE_BKTR */
|
||||
+#else
|
||||
+#define ast_store_lock_info(I,DONT,CARE,ABOUT,THE,PARAMETERS)
|
||||
+#endif
|
||||
#endif /* !defined(LOW_MEMORY) */
|
||||
|
||||
/*!
|
||||
@@ -306,19 +323,27 @@ void ast_mark_lock_failed(void *lock_add
|
||||
* be removed from the current thread's lock info struct.
|
||||
*/
|
||||
#if !defined(LOW_MEMORY)
|
||||
+#ifndef __UCLIBC__
|
||||
#ifdef HAVE_BKTR
|
||||
void ast_remove_lock_info(void *lock_addr, struct ast_bt *bt);
|
||||
#else
|
||||
void ast_remove_lock_info(void *lock_addr);
|
||||
#endif /* HAVE_BKTR */
|
||||
+#else
|
||||
+void ast_remove_lock_info(void *lock_addr);
|
||||
+#endif
|
||||
void ast_suspend_lock_info(void *lock_addr);
|
||||
void ast_restore_lock_info(void *lock_addr);
|
||||
#else
|
||||
+#ifndef __UCLIBC
|
||||
#ifdef HAVE_BKTR
|
||||
#define ast_remove_lock_info(ignore,me)
|
||||
#else
|
||||
#define ast_remove_lock_info(ignore)
|
||||
#endif /* HAVE_BKTR */
|
||||
+#else
|
||||
+#define ast_remove_lock_info(ignore)
|
||||
+#endif
|
||||
#define ast_suspend_lock_info(ignore);
|
||||
#define ast_restore_lock_info(ignore);
|
||||
#endif /* !defined(LOW_MEMORY) */
|
|
@ -1,22 +0,0 @@
|
|||
--- a/res/ael/ael.flex
|
||||
+++ b/res/ael/ael.flex
|
||||
@@ -595,7 +595,7 @@ includes { STORE_POS; return KW_INCLUDES
|
||||
snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
|
||||
ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
|
||||
}
|
||||
-#ifdef SOLARIS
|
||||
+#if !defined(HAVE_GLOB_NOMAGIC) || !defined(HAVE_GLOB_BRACE) || defined(DEBUG_NONGNU)
|
||||
glob_ret = glob(fnamebuf, GLOB_NOCHECK, NULL, &globbuf);
|
||||
#else
|
||||
glob_ret = glob(fnamebuf, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);
|
||||
--- a/res/ael/ael_lex.c
|
||||
+++ b/res/ael/ael_lex.c
|
||||
@@ -1976,7 +1976,7 @@ YY_RULE_SETUP
|
||||
snprintf(fnamebuf2,sizeof(fnamebuf2), "%s/%s", (char *)ast_config_AST_CONFIG_DIR, fnamebuf);
|
||||
ast_copy_string(fnamebuf,fnamebuf2,sizeof(fnamebuf));
|
||||
}
|
||||
-#ifdef SOLARIS
|
||||
+#if !defined(HAVE_GLOB_NOMAGIC) || !defined(HAVE_GLOB_BRACE) || defined(DEBUG_NONGNU)
|
||||
glob_ret = glob(fnamebuf, GLOB_NOCHECK, NULL, &globbuf);
|
||||
#else
|
||||
glob_ret = glob(fnamebuf, GLOB_NOMAGIC|GLOB_BRACE, NULL, &globbuf);
|
|
@ -1,30 +0,0 @@
|
|||
--- a/res/ael/ael.flex
|
||||
+++ b/res/ael/ael.flex
|
||||
@@ -79,6 +79,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
|
||||
#if !defined(GLOB_ABORTED)
|
||||
#define GLOB_ABORTED GLOB_ABEND
|
||||
#endif
|
||||
+#if !defined(GLOB_BRACE)
|
||||
+#define GLOB_BRACE 0
|
||||
+#endif
|
||||
+#if !defined(GLOB_NOMAGIC)
|
||||
+#define GLOB_NOMAGIC 0
|
||||
+#endif
|
||||
|
||||
#include "asterisk/logger.h"
|
||||
#include "asterisk/utils.h"
|
||||
--- a/res/ael/ael_lex.c
|
||||
+++ b/res/ael/ael_lex.c
|
||||
@@ -838,6 +838,12 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revisi
|
||||
#if !defined(GLOB_ABORTED)
|
||||
#define GLOB_ABORTED GLOB_ABEND
|
||||
#endif
|
||||
+#if !defined(GLOB_BRACE)
|
||||
+#define GLOB_BRACE 0
|
||||
+#endif
|
||||
+#if !defined(GLOB_NOMAGIC)
|
||||
+#define GLOB_NOMAGIC 0
|
||||
+#endif
|
||||
|
||||
#include "asterisk/logger.h"
|
||||
#include "asterisk/utils.h"
|
|
@ -1,37 +0,0 @@
|
|||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -175,6 +175,9 @@ case "${host_os}" in
|
||||
linux-gnu*)
|
||||
OSARCH=linux-gnu
|
||||
;;
|
||||
+ linux-musl*)
|
||||
+ OSARCH=linux-musl
|
||||
+ ;;
|
||||
kfreebsd*-gnu)
|
||||
OSARCH=kfreebsd-gnu
|
||||
;;
|
||||
@@ -1509,9 +1512,11 @@ AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_ope
|
||||
# openSUSE requires -lz
|
||||
AST_EXT_LIB_CHECK([BFD], [bfd], [bfd_openr], [bfd.h], [-ldl -liberty -lz])
|
||||
|
||||
-if test "x${OSARCH}" = "xlinux-gnu" ; then
|
||||
+case "${OSARCH}" in
|
||||
+linux*)
|
||||
AST_EXT_LIB_CHECK([CAP], [cap], [cap_from_text], [sys/capability.h])
|
||||
-fi
|
||||
+ ;;
|
||||
+esac
|
||||
|
||||
AST_C_DEFINE_CHECK([DAHDI], [DAHDI_RESET_COUNTERS], [dahdi/user.h], [230])
|
||||
AST_C_DEFINE_CHECK([DAHDI], [DAHDI_DEFAULT_MTU_MRU], [dahdi/user.h], [220])
|
||||
--- a/main/Makefile
|
||||
+++ b/main/Makefile
|
||||
@@ -47,7 +47,7 @@ AST_LIBS+=$(AST_CLANG_BLOCKS_LIBS)
|
||||
AST_LIBS+=$(RT_LIB)
|
||||
AST_LIBS+=$(SYSTEMD_LIB)
|
||||
|
||||
-ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc kfreebsd-gnu),)
|
||||
+ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-musl kfreebsd-gnu),)
|
||||
AST_LIBS+=-ldl
|
||||
ifneq (x$(CAP_LIB),x)
|
||||
AST_LIBS+=$(CAP_LIB)
|
|
@ -1,11 +0,0 @@
|
|||
--- a/include/asterisk/lock.h
|
||||
+++ b/include/asterisk/lock.h
|
||||
@@ -68,7 +68,7 @@
|
||||
#define AST_PTHREADT_NULL (pthread_t) -1
|
||||
#define AST_PTHREADT_STOP (pthread_t) -2
|
||||
|
||||
-#if (defined(SOLARIS) || defined(BSD))
|
||||
+#if (defined(SOLARIS) || defined(BSD) || !defined(HAVE_PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP))
|
||||
#define AST_MUTEX_INIT_W_CONSTRUCTORS
|
||||
#endif /* SOLARIS || BSD */
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- a/utils/Makefile
|
||||
+++ b/utils/Makefile
|
||||
@@ -180,7 +180,6 @@ check_expr2: $(ASTTOPDIR)/main/ast_expr2
|
||||
$(CC) -g -o check_expr2 ast_expr2fz.o ast_expr2z.o -lm $(_ASTLDFLAGS)
|
||||
$(ECHO_PREFIX) echo " [RM] ast_expr2fz.o ast_expr2z.o"
|
||||
rm ast_expr2z.o ast_expr2fz.o
|
||||
- ./check_expr2 expr2.testinput
|
||||
|
||||
smsq: smsq.o strcompat.o
|
||||
smsq: LIBS+=$(POPT_LIB)
|
|
@ -1,28 +0,0 @@
|
|||
--- a/build_tools/make_build_h
|
||||
+++ b/build_tools/make_build_h
|
||||
@@ -5,6 +5,14 @@ MACHINE=`uname -m | sed 's/\\\\/\\\\\\\
|
||||
OS=`uname -s`
|
||||
USER=`id | awk -F")" '{print $1}'| awk -F"(" '{print $2}' | sed 's/\\\\/\\\\\\\\/g'`
|
||||
DATE=`date -u "+%Y-%m-%d %H:%M:%S"`
|
||||
+if [ -n "${SOURCE_DATE_EPOCH}" ]; then
|
||||
+ # building reproducibly, faking some data
|
||||
+ HOSTNAME='buildd.debian.org'
|
||||
+ KERNEL='unknown'
|
||||
+ MACHINE='unknown'
|
||||
+ USER='nobody'
|
||||
+ DATE=`date -u "+%Y-%m-%d %H:%M:%S" -d @${SOURCE_DATE_EPOCH}`
|
||||
+fi
|
||||
cat << END
|
||||
/*
|
||||
* build.h
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -488,7 +488,7 @@ doc/core-en_US.xml: makeopts .lastclean
|
||||
@echo "<docs xmlns:xi=\"http://www.w3.org/2001/XInclude\">" >> $@
|
||||
@for x in $(MOD_SUBDIRS); do \
|
||||
printf "$$x " ; \
|
||||
- for i in `find $$x -name '*.c'`; do \
|
||||
+ for i in `find $$x -name '*.c' | LC_ALL=C sort`; do \
|
||||
$(AWK) -f build_tools/get_documentation $$i >> $@ ; \
|
||||
done ; \
|
||||
done
|
|
@ -1,35 +0,0 @@
|
|||
From a9d8b56831146166abc7fb8abe8ae8aaff295358 Mon Sep 17 00:00:00 2001
|
||||
From: George Joseph <gjoseph@digium.com>
|
||||
Date: Wed, 12 Jun 2019 12:03:04 -0600
|
||||
Subject: [PATCH] res_pjsip_messaging: Check for body in in-dialog message
|
||||
|
||||
We now check that a body exists and it has a length > 0 before
|
||||
attempting to process it.
|
||||
|
||||
ASTERISK-28447
|
||||
Reported-by: Gil Richard
|
||||
|
||||
Change-Id: Ic469544b22ab848734636588d4c93426cc6f4b1f
|
||||
---
|
||||
|
||||
diff --git a/res/res_pjsip_messaging.c b/res/res_pjsip_messaging.c
|
||||
index 10c5f29..76d37f2 100644
|
||||
--- a/res/res_pjsip_messaging.c
|
||||
+++ b/res/res_pjsip_messaging.c
|
||||
@@ -91,10 +91,13 @@
|
||||
static const pj_str_t text = { "text", 4};
|
||||
static const pj_str_t application = { "application", 11};
|
||||
|
||||
+ if (!(rdata->msg_info.msg->body && rdata->msg_info.msg->body->len > 0)) {
|
||||
+ return res;
|
||||
+ }
|
||||
+
|
||||
/* We'll accept any text/ or application/ content type */
|
||||
- if (rdata->msg_info.msg->body && rdata->msg_info.msg->body->len
|
||||
- && (pj_stricmp(&rdata->msg_info.msg->body->content_type.type, &text) == 0
|
||||
- || pj_stricmp(&rdata->msg_info.msg->body->content_type.type, &application) == 0)) {
|
||||
+ if (pj_stricmp(&rdata->msg_info.msg->body->content_type.type, &text) == 0
|
||||
+ || pj_stricmp(&rdata->msg_info.msg->body->content_type.type, &application) == 0) {
|
||||
res = PJSIP_SC_OK;
|
||||
} else if (rdata->msg_info.ctype
|
||||
&& (pj_stricmp(&rdata->msg_info.ctype->media.type, &text) == 0
|
|
@ -1,39 +0,0 @@
|
|||
From 3ab9291a563656dfebcb7de67c86351541f3de1c Mon Sep 17 00:00:00 2001
|
||||
From: Francesco Castellano <francesco.castellano@messagenet.it>
|
||||
Date: Fri, 28 Jun 2019 18:15:31 +0200
|
||||
Subject: [PATCH] chan_sip: Handle invalid SDP answer to T.38 re-invite
|
||||
|
||||
The chan_sip module performs a T.38 re-invite using a single media
|
||||
stream of udptl, and expects the SDP answer to be the same.
|
||||
|
||||
If an SDP answer is received instead that contains an additional
|
||||
media stream with no joint codec a crash will occur as the code
|
||||
assumes that at least one joint codec will exist in this
|
||||
scenario.
|
||||
|
||||
This change removes this assumption.
|
||||
|
||||
ASTERISK-28465
|
||||
|
||||
Change-Id: I8b02845b53344c6babe867a3f0a5231045c7ac87
|
||||
---
|
||||
|
||||
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
|
||||
index 7c8928d..223ff3c 100644
|
||||
--- a/channels/chan_sip.c
|
||||
+++ b/channels/chan_sip.c
|
||||
@@ -10911,7 +10911,13 @@
|
||||
ast_rtp_lookup_mime_multiple2(s3, NULL, newnoncodeccapability, 0, 0));
|
||||
}
|
||||
|
||||
- if (portno != -1 || vportno != -1 || tportno != -1) {
|
||||
+ /* When UDPTL is negotiated it is expected that there are no compatible codecs as audio or
|
||||
+ * video is not being transported, thus we continue in this function further up if that is
|
||||
+ * the case. If we receive an SDP answer containing both a UDPTL stream and another media
|
||||
+ * stream however we need to check again to ensure that there is at least one joint codec
|
||||
+ * instead of assuming there is one.
|
||||
+ */
|
||||
+ if ((portno != -1 || vportno != -1 || tportno != -1) && ast_format_cap_count(newjointcapability)) {
|
||||
/* We are now ready to change the sip session and RTP structures with the offered codecs, since
|
||||
they are acceptable */
|
||||
unsigned int framing;
|
|
@ -41,12 +41,6 @@ define Package/asterisk-chan-dongle/Default
|
|||
TITLE:=Huawei UMTS 3G dongle support
|
||||
endef
|
||||
|
||||
define Package/asterisk13-chan-dongle
|
||||
$(call Package/asterisk-chan-dongle/Default)
|
||||
DEPENDS+=asterisk13
|
||||
VARIANT:=asterisk13
|
||||
endef
|
||||
|
||||
define Package/asterisk16-chan-dongle
|
||||
$(call Package/asterisk-chan-dongle/Default)
|
||||
DEPENDS+=asterisk16
|
||||
|
@ -57,15 +51,8 @@ define Package/description/Default
|
|||
Asterisk channel driver for Huawei UMTS 3G dongle.
|
||||
endef
|
||||
|
||||
Package/asterisk13-chan-dongle/description = $(Package/description/Default)
|
||||
Package/asterisk16-chan-dongle/description = $(Package/description/Default)
|
||||
|
||||
ifeq ($(BUILD_VARIANT),asterisk13)
|
||||
CHAN_DONGLE_AST_HEADERS:=$(STAGING_DIR)/usr/include/asterisk-13/include
|
||||
CONFIGURE_ARGS+= \
|
||||
--with-astversion=13
|
||||
endif
|
||||
|
||||
ifeq ($(BUILD_VARIANT),asterisk16)
|
||||
CHAN_DONGLE_AST_HEADERS:=$(STAGING_DIR)/usr/include/asterisk-16/include
|
||||
CONFIGURE_ARGS+= \
|
||||
|
@ -89,7 +76,6 @@ define Package/conffiles/Default
|
|||
/etc/asterisk/dongle.conf
|
||||
endef
|
||||
|
||||
Package/asterisk13-chan-dongle/conffiles = $(Package/conffiles/Default)
|
||||
Package/asterisk16-chan-dongle/conffiles = $(Package/conffiles/Default)
|
||||
|
||||
define Package/Install/Default
|
||||
|
@ -99,8 +85,6 @@ define Package/Install/Default
|
|||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/chan_dongle.so $(1)$(MODULES_DIR)
|
||||
endef
|
||||
|
||||
Package/asterisk13-chan-dongle/install = $(Package/Install/Default)
|
||||
Package/asterisk16-chan-dongle/install = $(Package/Install/Default)
|
||||
|
||||
$(eval $(call BuildPackage,asterisk13-chan-dongle))
|
||||
$(eval $(call BuildPackage,asterisk16-chan-dongle))
|
||||
|
|
|
@ -42,19 +42,6 @@ define Package/chan-sccp/Default
|
|||
DEPENDS:=$(ICONV_DEPENDS) +libltdl
|
||||
endef
|
||||
|
||||
define Package/asterisk13-chan-sccp
|
||||
$(call Package/chan-sccp/Default)
|
||||
DEPENDS += asterisk13 \
|
||||
+asterisk13-bridge-holding \
|
||||
+asterisk13-bridge-native-rtp \
|
||||
+asterisk13-bridge-simple \
|
||||
+asterisk13-bridge-softmix \
|
||||
+asterisk13-res-stasis-device-state \
|
||||
+asterisk13-voicemail
|
||||
VARIANT:=asterisk13
|
||||
CONFLICTS:=asterisk13-chan-skinny
|
||||
endef
|
||||
|
||||
define Package/asterisk16-chan-sccp
|
||||
$(call Package/chan-sccp/Default)
|
||||
DEPENDS += asterisk16 \
|
||||
|
@ -74,7 +61,6 @@ Extended features include shared lines, presence / BLF, customizable
|
|||
feature buttons and custom device state.
|
||||
endef
|
||||
|
||||
Package/asterisk13-chan-sccp/description = $(Package/description/Default)
|
||||
Package/asterisk16-chan-sccp/description = $(Package/description/Default)
|
||||
|
||||
CONFIGURE_ARGS += \
|
||||
|
@ -83,10 +69,6 @@ CONFIGURE_ARGS += \
|
|||
--enable-conference \
|
||||
--enable-video
|
||||
|
||||
ifeq ($(BUILD_VARIANT),asterisk13)
|
||||
CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-13
|
||||
endif
|
||||
|
||||
ifeq ($(BUILD_VARIANT),asterisk16)
|
||||
CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-16
|
||||
endif
|
||||
|
@ -95,7 +77,6 @@ define Package/conffiles/Default
|
|||
/etc/asterisk/sccp.conf
|
||||
endef
|
||||
|
||||
Package/asterisk13-chan-sccp/conffiles = $(Package/conffiles/Default)
|
||||
Package/asterisk16-chan-sccp/conffiles = $(Package/conffiles/Default)
|
||||
|
||||
define Package/Install/Default
|
||||
|
@ -105,8 +86,6 @@ define Package/Install/Default
|
|||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/
|
||||
endef
|
||||
|
||||
Package/asterisk13-chan-sccp/install = $(Package/Install/Default)
|
||||
Package/asterisk16-chan-sccp/install = $(Package/Install/Default)
|
||||
|
||||
$(eval $(call BuildPackage,asterisk13-chan-sccp))
|
||||
$(eval $(call BuildPackage,asterisk16-chan-sccp))
|
||||
|
|
|
@ -36,12 +36,6 @@ define Package/asterisk-g72x/Default
|
|||
DEPENDS:=+bcg729
|
||||
endef
|
||||
|
||||
define Package/asterisk13-codec-g729
|
||||
$(call Package/asterisk-g72x/Default)
|
||||
DEPENDS+=asterisk13
|
||||
VARIANT:=asterisk13
|
||||
endef
|
||||
|
||||
define Package/asterisk16-codec-g729
|
||||
$(call Package/asterisk-g72x/Default)
|
||||
DEPENDS+=asterisk16
|
||||
|
@ -52,19 +46,12 @@ define Package/description/Default
|
|||
Asterisk G.729 codec based on bcg729 implementation.
|
||||
endef
|
||||
|
||||
Package/asterisk13-codec-g729/description = $(Package/description/Default)
|
||||
Package/asterisk16-codec-g729/description = $(Package/description/Default)
|
||||
|
||||
CONFIGURE_ARGS+= \
|
||||
--with-bcg729 \
|
||||
--enable-shared
|
||||
|
||||
ifeq ($(BUILD_VARIANT),asterisk13)
|
||||
CONFIGURE_ARGS+= \
|
||||
--with-asterisk-includes=$(STAGING_DIR)/usr/include/asterisk-13/include \
|
||||
--with-asterisk130
|
||||
endif
|
||||
|
||||
ifeq ($(BUILD_VARIANT),asterisk16)
|
||||
CONFIGURE_ARGS+= \
|
||||
--with-asterisk-includes=$(STAGING_DIR)/usr/include/asterisk-16/include \
|
||||
|
@ -77,8 +64,6 @@ define Package/Install/Default
|
|||
$(1)/usr/lib/asterisk/modules/
|
||||
endef
|
||||
|
||||
Package/asterisk13-codec-g729/install = $(Package/Install/Default)
|
||||
Package/asterisk16-codec-g729/install = $(Package/Install/Default)
|
||||
|
||||
$(eval $(call BuildPackage,asterisk13-codec-g729))
|
||||
$(eval $(call BuildPackage,asterisk16-codec-g729))
|
||||
|
|
|
@ -41,12 +41,6 @@ define Package/$(PKG_NAME)/Default
|
|||
DEPENDS:=+libopus
|
||||
endef
|
||||
|
||||
define Package/asterisk13-codec-opus
|
||||
$(call Package/$(PKG_NAME)/Default)
|
||||
DEPENDS+=asterisk13
|
||||
VARIANT:=asterisk13
|
||||
endef
|
||||
|
||||
define Package/asterisk16-codec-opus
|
||||
$(call Package/$(PKG_NAME)/Default)
|
||||
DEPENDS+=asterisk16
|
||||
|
@ -67,13 +61,8 @@ define Package/description/Default
|
|||
well.
|
||||
endef
|
||||
|
||||
Package/asterisk13-codec-opus/description = $(Package/description/Default)
|
||||
Package/asterisk16-codec-opus/description = $(Package/description/Default)
|
||||
|
||||
ifeq ($(BUILD_VARIANT),asterisk13)
|
||||
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/asterisk-13/include
|
||||
endif
|
||||
|
||||
ifeq ($(BUILD_VARIANT),asterisk16)
|
||||
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/asterisk-16/include
|
||||
endif
|
||||
|
@ -84,11 +73,9 @@ define Package/Install/Default
|
|||
$(1)/usr/lib/asterisk/modules
|
||||
endef
|
||||
|
||||
Package/asterisk13-codec-opus/install = $(Package/Install/Default)
|
||||
Package/asterisk16-codec-opus/install = $(Package/Install/Default)
|
||||
|
||||
define Build/Configure
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,asterisk13-codec-opus))
|
||||
$(eval $(call BuildPackage,asterisk16-codec-opus))
|
||||
|
|
Loading…
Reference in a new issue