Skip to content

GitLab

A
asterisk
Commit d7777e11 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated asterisk to 18.5.0

parent bd5a4eb7
Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 8 deletions
Makefile
View file @ d7777e11
...@@ -21,20 +21,20 @@ all: asterisk-socket ...@@ -21,20 +21,20 @@ all: asterisk-socket
ln -sv /data/etc/shadow /etc/shadow ln -sv /data/etc/shadow /etc/shadow
mv -v /etc/gshadow /data/etc/gshadow mv -v /etc/gshadow /data/etc/gshadow
ln -sv /data/etc/gshadow /etc/gshadow ln -sv /data/etc/gshadow /etc/gshadow
tar xf asterisk-18.2.0.tar.gz tar xf asterisk-18.5.0.tar.gz
patch -Np1 -d asterisk-18.2.0 < asterisk-18.2.0-fqdn_contact.patch patch -Np1 -d asterisk-18.5.0 < asterisk-18.5.0-fqdn_contact.patch
cd asterisk-18.2.0 && LIBS=-lcrypto ./configure --prefix=/usr cd asterisk-18.5.0 && LIBS=-lcrypto ./configure --prefix=/usr
$(MAKE) -C asterisk-18.2.0 $(MAKE) -C asterisk-18.5.0
$(MAKE) -C asterisk-18.2.0 install $(MAKE) -C asterisk-18.5.0 install
cd asterisk-18.2.0 && install -v -m644 configs/samples/* /etc/asterisk cd asterisk-18.5.0 && install -v -m644 configs/samples/* /etc/asterisk
chown -R asterisk.asterisk /var/lib/asterisk chown -R asterisk.asterisk /var/lib/asterisk
chown -R asterisk.asterisk /var/log/asterisk chown -R asterisk.asterisk /var/log/asterisk
chown -R asterisk.asterisk /var/spool/asterisk chown -R asterisk.asterisk /var/spool/asterisk
@echo "d /run/asterisk 755 asterisk asterisk -" > /usr/lib/tmpfiles.d/asterisk.conf @echo "d /run/asterisk 755 asterisk asterisk -" > /usr/lib/tmpfiles.d/asterisk.conf
install -v -Dm644 asterisk-18.2.0/contrib/systemd/asterisk.service /lib/systemd/system/asterisk.service install -v -Dm644 asterisk-18.5.0/contrib/systemd/asterisk.service /lib/systemd/system/asterisk.service
systemctl enable asterisk.service systemctl enable asterisk.service
@echo "$$ASTERISK_SOCKET" > /lib/systemd/system/asterisk.socket @echo "$$ASTERISK_SOCKET" > /lib/systemd/system/asterisk.socket
rm -rf asterisk-18.2.0 rm -rf asterisk-18.5.0
asterisk-socket: asterisk-socket:
define ASTERISK_SOCKET define ASTERISK_SOCKET
......
asterisk-18.2.0-fqdn_contact.patch → asterisk-18.5.0-fqdn_contact.patch
View file @ d7777e11
diff -uNr asterisk-18.2.0/res/res_pjsip_nat.c asterisk-18.2.0-fqdn_contact/res/res_pjsip_nat.c diff -uNr asterisk-18.5.0/res/res_pjsip_nat.c asterisk-18.5.0-fqdn_contact/res/res_pjsip_nat.c
--- asterisk-18.2.0/res/res_pjsip_nat.c 2021-01-22 03:03:58.000000000 +1030 --- asterisk-18.5.0/res/res_pjsip_nat.c 2021-06-24 22:20:57.000000000 +0930
+++ asterisk-18.2.0-fqdn_contact/res/res_pjsip_nat.c 2021-03-23 15:27:31.418938637 +1030 +++ asterisk-18.5.0-fqdn_contact/res/res_pjsip_nat.c 2024-02-27 17:18:33.258451688 +1030
@@ -434,7 +434,11 @@ @@ -445,7 +445,11 @@
if (!ast_sockaddr_isnull(&transport_state->external_signaling_address)) { pjsip_method_cmp(&cseq->method, &pjsip_register_method)) {
/* Update the contact header with the external address */ /* We can only rewrite the URI when one is present */
if (uri || (uri = nat_get_contact_sip_uri(tdata))) { if (uri || (uri = nat_get_contact_sip_uri(tdata))) {
- pj_strdup2(tdata->pool, &uri->host, ast_sockaddr_stringify_host(&transport_state->external_signaling_address)); - pj_strdup2(tdata->pool, &uri->host, ast_sockaddr_stringify_host(&transport_state->external_signaling_address));
+ if (!ast_strlen_zero(transport->domain)) { + if (!ast_strlen_zero(transport->domain)) {
...@@ -14,7 +14,7 @@ diff -uNr asterisk-18.2.0/res/res_pjsip_nat.c asterisk-18.2.0-fqdn_contact/res/r ...@@ -14,7 +14,7 @@ diff -uNr asterisk-18.2.0/res/res_pjsip_nat.c asterisk-18.2.0-fqdn_contact/res/r
if (transport->external_signaling_port) { if (transport->external_signaling_port) {
uri->port = transport->external_signaling_port; uri->port = transport->external_signaling_port;
ast_debug(4, "Re-wrote Contact URI port to %d\n", uri->port); ast_debug(4, "Re-wrote Contact URI port to %d\n", uri->port);
@@ -443,7 +447,11 @@ @@ -455,7 +459,11 @@
/* Update the via header if relevant */ /* Update the via header if relevant */
if ((tdata->msg->type == PJSIP_REQUEST_MSG) && (via || (via = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL)))) { if ((tdata->msg->type == PJSIP_REQUEST_MSG) && (via || (via = pjsip_msg_find_hdr(tdata->msg, PJSIP_H_VIA, NULL)))) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment