set standard properties on all non-binary files
[asterisk/asterisk.git] / udptl.c
diff --git a/udptl.c b/udptl.c
index 528ff4a..0605892 100644 (file)
--- a/udptl.c
+++ b/udptl.c
@@ -29,7 +29,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 8038 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/udptl.h"
 #include "asterisk/frame.h"
@@ -645,7 +645,6 @@ struct ast_frame *ast_udptl_read(struct ast_udptl *udptl)
        uint16_t seqno = 0;
        char iabuf[INET_ADDRSTRLEN];
        uint16_t *udptlheader;
-       static struct ast_frame null_frame = { AST_FRAME_NULL, };
 
        len = sizeof(sin);
        
@@ -662,12 +661,12 @@ struct ast_frame *ast_udptl_read(struct ast_udptl *udptl)
                        ast_log(LOG_WARNING, "UDPTL read error: %s\n", strerror(errno));
                if (errno == EBADF)
                        CRASH;
-               return &null_frame;
+               return &ast_null_frame;
        }
 
        /* Ignore if the other side hasn't been given an address yet. */
        if (!udptl->them.sin_addr.s_addr || !udptl->them.sin_port)
-               return &null_frame;
+               return &ast_null_frame;
 
        if (udptl->nat) {
                /* Send to whoever sent to us */
@@ -972,7 +971,7 @@ static struct ast_udptl_protocol *get_proto(struct ast_channel *chan)
 
        cur = protos;
        while (cur) {
-               if (cur->type == chan->type)
+               if (cur->type == chan->tech->type)
                        return cur;
                cur = cur->next;
        }