This was missing at merge:

[lcr.git] / gsm_bs.cpp

diff --git a/gsm_bs.cpp b/gsm_bs.cpp
index 3fc9a88..e25732a 100644 (file)
--- a/gsm_bs.cpp
+++ b/gsm_bs.cpp
@@ -93,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);
 
@@ -931,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();
@@ -1004,7 +1005,7 @@ static int socket_retry_cb(struct lcr_timer *timer, void *instance, int index)
 int gsm_bs_init(void)
 {
        gsm->sun.sun_family = AF_UNIX;
-       strcpy(gsm->sun.sun_path, "/tmp/bsc_mncc");
+       SCPY(gsm->sun.sun_path, "/tmp/bsc_mncc");
 
        memset(&gsm->socket_retry, 0, sizeof(gsm->socket_retry));
        add_timer(&gsm->socket_retry, socket_retry_cb, NULL, 0);