# HG changeset patch # User Mychaela Falconia # Date 1664348452 28800 # Node ID 9213ec8b434b7fed48e79eff1266d9ce551ccd6b # Parent ce3b1db7d1d7e6eab9e186e630c4d91b81762ee4 sip-in: handle themwi-mncc shutdown without terminating diff -r ce3b1db7d1d7 -r 9213ec8b434b sip-in/Makefile --- a/sip-in/Makefile Tue Sep 27 21:52:07 2022 -0800 +++ b/sip-in/Makefile Tue Sep 27 23:00:52 2022 -0800 @@ -3,7 +3,7 @@ PROG= themwi-sip-in OBJS= bye_in.o bye_out.o call_list.o call_setup.o cancel.o disconnect.o \ invite.o main.o mgw_ops.o mgw_sock.o mncc_handle.o mncc_sock.o \ - readconf.o retrans.o sip_ack.o sip_log.o sip_uas.o sip_udp.o + readconf.o retrans.o shutdown.o sip_ack.o sip_log.o sip_uas.o sip_udp.o LIBS= ../libnumdb/libnumdb.a ../libsip/libsip.a ../libutil/libutil.a INSTBIN=/usr/local/bin diff -r ce3b1db7d1d7 -r 9213ec8b434b sip-in/mncc_sock.c --- a/sip-in/mncc_sock.c Tue Sep 27 21:52:07 2022 -0800 +++ b/sip-in/mncc_sock.c Tue Sep 27 23:00:52 2022 -0800 @@ -48,10 +48,10 @@ int rc; rc = recv(gsm_socket, &msg, sizeof msg, 0); - if (rc < 0) { - syslog(LOG_CRIT, "error reading from mtcall socket: %m"); - /* GSM disconnect handling to be implemented */ - exit(1); + if (rc <= 0) { + syslog(LOG_ERR, "mtcall socket disconnected"); + shutdown_gsm_conn(); + gsm_is_connected = 0; } if (rc < 4) { syslog(LOG_CRIT, "short read from mtcall socket: %d bytes", rc); diff -r ce3b1db7d1d7 -r 9213ec8b434b sip-in/shutdown.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/sip-in/shutdown.c Tue Sep 27 23:00:52 2022 -0800 @@ -0,0 +1,62 @@ +/* + * In this module we handle the scenarios of themwi-mncc and/or themwi-mgw + * shutting down while we are connected to them. In both scenarios we + * terminate all active calls (graceful disconnect signaling toward SIP + * callers and toward whichever ThemWi daemon is still running, if either), + * but our themwi-sip-in process itself stays running. This way once + * the other required processes restart, inbound calls will start working + * once again, without needing to restart themwi-sip-in. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../include/mncc.h" +#include "../include/gsm48_const.h" +#include "call.h" + +extern struct call *call_list; + +static struct gsm_mncc_cause shutdown_cause = { + .coding = GSM48_CAUSE_CODING_GSM, + .location = GSM48_CAUSE_LOC_PRN_S_LU, + .value = GSM48_CC_CAUSE_NETWORK_OOO, +}; + +void +shutdown_gsm_conn() +{ + struct call *call; + + for (call = call_list; call; call = call->next) { + call->mncc_state = MNCC_STATE_NO_EXIST; + if (call->overall_state != OVERALL_STATE_DEAD_SIP) { + call->overall_state = OVERALL_STATE_TEARDOWN; + disconnect_tmgw(call); + disconnect_sip(call, &shutdown_cause); + } + } +} + +void +shutdown_mgw_conn() +{ + struct call *call; + + for (call = call_list; call; call = call->next) { + call->mgw_state = MGW_STATE_NO_EXIST; + call->mgw_xact = 0; + if (call->overall_state != OVERALL_STATE_DEAD_SIP) { + call->overall_state = OVERALL_STATE_TEARDOWN; + disconnect_mncc(call, GSM48_CAUSE_LOC_PRN_S_LU, + GSM48_CC_CAUSE_NETWORK_OOO); + disconnect_sip(call, &shutdown_cause); + } + } +}