Merged revisions 209760-209761 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

................
  r209760 | kpfleming | 2009-07-31 20:03:07 -0500 (Fri, 31 Jul 2009) | 13 lines

  Merged revisions 209759 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r209759 | kpfleming | 2009-07-31 19:52:00 -0500 (Fri, 31 Jul 2009) | 7 lines

    Minor changes inspired by testing with latest GCC.

    The latest GCC (what will become 4.5.x) has a few new warnings, that in these
    cases found some either downright buggy code, or at least seriously poorly
    designed code that could be improved.
  ........
................
  r209761 | kpfleming | 2009-07-31 20:04:06 -0500 (Fri, 31 Jul 2009) | 1 line

  Revert accidental Makefile change.
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@209781 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/misdn/ie.c b/channels/misdn/ie.c
index dc9802845b8dc5ac896d32b397dfc4e6eb491c4c..cd88db92c1823bb22c172ab75b026be16f79d971 100644 (file)
--- a/channels/misdn/ie.c
+++ b/channels/misdn/ie.c
@@ -248,7 +248,7 @@ static void dec_ie_bearer(unsigned char *p, Q931_info_t *qi, int *coding, int *c
                if (p[0] <= octet)
                        goto done;
                
-               if (!p[octet++] & 0x80)
+               if (~p[octet++] & 0x80)
                        goto l2;
 
                /* Wheee. V.110 speed information */

diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c
index 63aaa211ab63f5989617865f266a458abec224a5..65ef9f918293d0162f2a1f9d0f4ef397736f76b8 100644 (file)
--- a/channels/misdn/isdn_lib.c
+++ b/channels/misdn/isdn_lib.c
@@ -1924,9 +1924,7 @@ handle_event_nt(void *dat, void *arg)
                case CC_SETUP|INDICATION:
                {
                        struct misdn_bchannel* bc=misdn_lib_get_free_bc(stack->port, 0, 1, 0);
-                       if (!bc) 
-                       ERR_NO_CHANNEL:
-                       {
+                       if (!bc) {
                                msg_t *dmsg;
                                cb_log(4, stack->port, "Patch from MEIDANIS:Sending RELEASE_COMPLETE %x (No free Chan for you..)\n", hh->dinfo);
                                dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST,MT_RELEASE_COMPLETE, hh->dinfo,sizeof(RELEASE_COMPLETE_t), 1);
@@ -2123,8 +2121,15 @@ handle_event_nt(void *dat, void *arg)
                                        if (bc->channel<=0 || bc->channel==0xff) 
                                                bc->channel=0;
                                
-                                       if (find_free_chan_in_stack(stack,bc, bc->channel,0)<0) 
-                                               goto ERR_NO_CHANNEL;
+                                       if (find_free_chan_in_stack(stack,bc, bc->channel,0)<0) {
+                                               msg_t *dmsg;
+                                               cb_log(4, stack->port, "Patch from MEIDANIS:Sending RELEASE_COMPLETE %x (No free Chan for you..)\n", hh->dinfo);
+                                               dmsg = create_l3msg(CC_RELEASE_COMPLETE | REQUEST,MT_RELEASE_COMPLETE, hh->dinfo,sizeof(RELEASE_COMPLETE_t), 1);
+                                               pthread_mutex_lock(&stack->nstlock);
+                                               stack->nst.manager_l3(&stack->nst, dmsg);
+                                               free_msg(msg);
+                                               return 0;
+                                       }
                                        break;
                                case EVENT_RELEASE:
                                case EVENT_RELEASE_COMPLETE:

diff --git a/main/Makefile b/main/Makefile
index 851ab7c563fda80f39d1c8fc008818e42b0c7b8c..1f23938c42c821a1b749f0af15ae494119a309e2 100644 (file)
--- a/main/Makefile
+++ b/main/Makefile
@@ -108,7 +108,7 @@ editline/libedit.a: CHECK_SUBDIR
        $(MAKE) -C editline libedit.a
 
 db1-ast/libdb1.a: CHECK_SUBDIR
-       CFLAGS="$(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS) $(ASTCFLAGS))" LDFLAGS="$(ASTLDFLAGS)" $(MAKE) -C db1-ast libdb1.a
+       _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
 
 ast_expr2.c ast_expr2.h:
        bison -o $@ -d --name-prefix=ast_yy ast_expr2.y

diff --git a/utils/frame.c b/utils/frame.c
index abc3a300053fdd808f4a81ea7f9e7d6b25c65bd4..2900cb06562391aa50eaa5e9374122a14170d7b9 100644 (file)
--- a/utils/frame.c
+++ b/utils/frame.c
@@ -744,7 +744,7 @@ void checknoargs( int argcount, char *args[])
 void parseargs( int argcount, char *args[], int fileswitch)
 {
    char *filename;
-   int tempint;
+   int tempint = 0;
 
    if ((fileswitch & 1) != 0)     /* If getting infile  */
      in = NULL;