X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=lcr.git;a=blobdiff_plain;f=gsm_bs.cpp;h=e25732aacc7c5ae00255af97e5f299676c35dd66;hp=829d58af99683dcf87f3112b3f30ff721114b6e9;hb=2f5c3dc13063fc5e4cc4b72d2c3484be238c142e;hpb=740846314923a61f9608ac0b59830ed459537b90

diff --git a/gsm_bs.cpp b/gsm_bs.cpp
index 829d58a..e25732a 100644
--- a/gsm_bs.cpp
+++ b/gsm_bs.cpp
@@ -26,6 +26,8 @@ extern "C" {
 #include <openbsc/trau_frame.h>
 }
 
+#define SOCKET_RETRY_TIMER	5
+
 /*
  * DTMF stuff
  */
@@ -91,6 +93,7 @@ void Pgsm_bs::start_dtmf_ind(unsigned int msg_type, unsigned int callref, struct
 	add_trace("keypad", NULL, "%c", mncc->keypad);
 	end_trace();
 	resp = create_mncc(MNCC_START_DTMF_RSP, p_m_g_callref);
+	resp->fields |= MNCC_F_KEYPAD;
 	resp->keypad = mncc->keypad;
 	send_and_free_mncc(p_m_g_instance, resp->msg_type, resp);
 
@@ -561,6 +564,20 @@ void Pgsm_bs::message_setup(unsigned int epoint_id, int message_id, union parame
 	memcpy(&p_capainfo, &param->setup.capainfo, sizeof(p_capainfo));
 	memcpy(&p_redirinfo, &param->setup.redirinfo, sizeof(p_redirinfo));
 
+	/* no GSM MNCC connection */
+	if (gsm->mncc_lfd.fd < 0) {
+		gsm_trace_header(p_m_mISDNport, this, MNCC_SETUP_REQ, DIRECTION_OUT);
+		add_trace("failure", NULL, "No MNCC connection.");
+		end_trace();
+		message = message_create(p_serial, epoint_id, PORT_TO_EPOINT, MESSAGE_RELEASE);
+		message->param.disconnectinfo.cause = 27; // temp. unavail.
+		message->param.disconnectinfo.location = LOCATION_PRIVATE_LOCAL;
+		message_put(message);
+		new_state(PORT_STATE_RELEASE);
+		trigger_work(&p_m_g_delete);
+		return;
+	}
+
 	/* no number */
 	if (!p_dialinginfo.id[0]) {
 		gsm_trace_header(p_m_mISDNport, this, MNCC_SETUP_REQ, DIRECTION_OUT);
@@ -866,15 +883,11 @@ static int mncc_fd_close(struct lcr_fd *lfd)
 	class Pgsm_bs *pgsm_bs = NULL;
 	struct lcr_msg *message;
 
-	printf("mncc_sock: closing\n");
+	PERROR("Lost MNCC socket, retrying in %u seconds\n", SOCKET_RETRY_TIMER);
 	close(lfd->fd);
 	unregister_fd(lfd);
 	lfd->fd = -1;
 
-	/* flush the queue */
-	while (mncc_q_dequeue())
-		;
-
 	/* free all the calls that were running through the MNCC interface */
 	port = port_first;
 	while(port) {
@@ -890,7 +903,12 @@ static int mncc_fd_close(struct lcr_fd *lfd)
 		port = port->next;
 	}
 
-	/* FIXME: start a re-connect timer */
+	/* flush the queue */
+	while (mncc_q_dequeue())
+		;
+
+	/* start the re-connect timer */
+	schedule_timer(&gsm->socket_retry, SOCKET_RETRY_TIMER, 0);
 
 	generate_dtmf();
 
@@ -914,7 +932,7 @@ static int mncc_fd_write(struct lcr_fd *lfd, void *inst, int idx)
 			return mncc_fd_close(lfd);
 		if (rc < 0)
 			return rc;
-		if (rc < qe->len)
+		if (rc < (int)qe->len)
 			return -1;
 		/* dequeue the successfully sent message */
 		qe2 = mncc_q_dequeue();
@@ -958,24 +976,42 @@ static int mncc_fd_cb(struct lcr_fd *lfd, unsigned int what, void *instance, int
 	return rc;
 }
 
-int gsm_bs_init(void)
+static int socket_retry_cb(struct lcr_timer *timer, void *instance, int index)
 {
-	struct sockaddr_un sun;
-	int rc;
+	int fd, rc;
 
-	rc = socket(PF_UNIX, SOCK_SEQPACKET, 0);
-	if (rc < 0)
-		return rc;
+	fd = socket(PF_UNIX, SOCK_SEQPACKET, 0);
+	if (fd < 0) {
+		PERROR("Cannot create SEQPACKET socket, giving up!\n");
+		return fd;
+	}
 
-	gsm->mncc_lfd.fd = rc;
+	rc = connect(fd, (struct sockaddr *) &gsm->sun,
+		     sizeof(gsm->sun));
+	if (rc < 0) {
+		PERROR("Could not connect to MNCC socket, "
+			"retrying in %u seconds\n", SOCKET_RETRY_TIMER);
+		close(fd);
+		schedule_timer(&gsm->socket_retry, SOCKET_RETRY_TIMER, 0);
+	} else {
+		PDEBUG(DEBUG_GSM, "Connected to MNCC socket!\n");
+		gsm->mncc_lfd.fd = fd;
+		register_fd(&gsm->mncc_lfd, LCR_FD_READ, &mncc_fd_cb, NULL, 0);
+	}
 
-	sun.sun_family = AF_UNIX;
-	strcpy(sun.sun_path, "/tmp/bsc_mncc");
-	rc = connect(rc, (struct sockaddr *)&sun, sizeof(sun));
-	if (rc < 0)
-		return rc;
+	return 0;
+}
 
-	rc = register_fd(&gsm->mncc_lfd, LCR_FD_READ, &mncc_fd_cb, NULL, 0);
+int gsm_bs_init(void)
+{
+	gsm->sun.sun_family = AF_UNIX;
+	SCPY(gsm->sun.sun_path, "/tmp/bsc_mncc");
 
-	return rc;
+	memset(&gsm->socket_retry, 0, sizeof(gsm->socket_retry));
+	add_timer(&gsm->socket_retry, socket_retry_cb, NULL, 0);
+
+	/* do the initial connect */
+	socket_retry_cb(&gsm->socket_retry, NULL, 0);
+
+	return 0;
 }