diff options
-rw-r--r-- | channels/chan_misdn.c | 6 | ||||
-rw-r--r-- | channels/misdn/isdn_lib.c | 10 | ||||
-rw-r--r-- | codecs/Makefile | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/channels/chan_misdn.c b/channels/chan_misdn.c index c70c45938..bb31de0ba 100644 --- a/channels/chan_misdn.c +++ b/channels/chan_misdn.c @@ -2008,13 +2008,9 @@ static int misdn_call(struct ast_channel *ast, char *dest, int timeout) struct chan_list *ch=MISDN_ASTERISK_TECH_PVT(ast); struct misdn_bchannel *newbc; char *opts=NULL, *ext; - char dest_cp[256]; { - strncpy(dest_cp,dest,sizeof(dest_cp)-1); - dest_cp[sizeof(dest_cp)]=0; - - ext=dest_cp; + ext = ast_strdupa(dest); strsep(&ext,"/"); if (ext) { opts=ext; diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index 6d30afdc8..64b92f66a 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -2407,12 +2407,12 @@ static int handle_bchan(msg_t *msg) case PH_CONTROL|INDICATION: { - unsigned int cont = *((unsigned int *)&frm->data.p); + unsigned int *cont = (unsigned int *) &frm->data.p; cb_log(4, stack->port, "PH_CONTROL: channel:%d oad%d:%s dad%d:%s \n", bc->channel, bc->onumplan,bc->oad, bc->dnumplan,bc->dad); - if ((cont&~DTMF_TONE_MASK) == DTMF_TONE_VAL) { - int dtmf = cont & DTMF_TONE_MASK; + if ((*cont & ~DTMF_TONE_MASK) == DTMF_TONE_VAL) { + int dtmf = *cont & DTMF_TONE_MASK; cb_log(4, stack->port, " --> DTMF TONE: %c\n",dtmf); bc->dtmf=dtmf; cb_event(EVENT_DTMF_TONE, bc, glob_mgr->user_data); @@ -2420,12 +2420,12 @@ static int handle_bchan(msg_t *msg) free_msg(msg); return 1; } - if (cont == BF_REJECT) { + if (*cont == BF_REJECT) { cb_log(4, stack->port, " --> BF REJECT\n"); free_msg(msg); return 1; } - if (cont == BF_ACCEPT) { + if (*cont == BF_ACCEPT) { cb_log(4, stack->port, " --> BF ACCEPT\n"); free_msg(msg); return 1; diff --git a/codecs/Makefile b/codecs/Makefile index 503e7c935..6cccfdb20 100644 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -56,6 +56,6 @@ $(LIBLPC10): $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10) $(LIBILBC): - @$(MAKE) -C ilbc all + @$(MAKE) -C ilbc all ASTCFLAGS="$(ASTCFLAGS) $(AST_NO_STRICT_OVERFLOW)" $(if $(filter codec_ilbc,$(EMBEDDED_MODS)),modules.link,codec_ilbc.so): $(LIBILBC) |