correct types on invalid_handler

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@1029 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/include/switch_rtp.h b/src/include/switch_rtp.h
index c08654024eb0fb854962d10fb4a380ddb4b5b1fe..1df0d08dca63973444d4553be5c511bf277226ed 100644 (file)
--- a/src/include/switch_rtp.h
+++ b/src/include/switch_rtp.h
@@ -51,7 +51,7 @@ extern "C" {
 typedef void (*switch_rtp_invalid_handler)(switch_rtp *rtp_session,
                                                                                   switch_socket_t *sock,
                                                                                   void *data,
-                                                                                  unsigned int datalen,
+                                                                                  switch_size_t datalen,
                                                                                   switch_sockaddr_t *from_addr);
 
 

diff --git a/src/mod/endpoints/mod_dingaling/mod_dingaling.c b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
index a694a112fc44fd922cf84ee439036499a30beb43..9d4a681791758b72b0b48a22016f7598dd5cd401 100644 (file)
--- a/src/mod/endpoints/mod_dingaling/mod_dingaling.c
+++ b/src/mod/endpoints/mod_dingaling/mod_dingaling.c
@@ -177,7 +177,7 @@ static switch_status channel_write_frame(switch_core_session *session, switch_fr
 static switch_status channel_kill_channel(switch_core_session *session, int sig);
 static ldl_status handle_signalling(ldl_handle_t *handle, ldl_session_t *dlsession, ldl_signal_t signal, char *msg);
 static ldl_status handle_response(ldl_handle_t *handle, char *id);
-static void stun_callback(struct switch_rtp *switch_rtp, switch_socket_t *sock, void *data, unsigned int len, switch_sockaddr_t *from_addr);
+static void stun_callback(struct switch_rtp *switch_rtp, switch_socket_t *sock, void *data, switch_size_t len, switch_sockaddr_t *from_addr);
 static switch_status load_config(void);
 
 
@@ -1402,7 +1402,7 @@ static ldl_status handle_response(ldl_handle_t *handle, char *id)
        return LDL_STATUS_SUCCESS;
 }
 
-static void stun_callback(struct switch_rtp *switch_rtp, switch_socket_t *sock, void *data, unsigned int len, switch_sockaddr_t *from_addr)
+static void stun_callback(struct switch_rtp *switch_rtp, switch_socket_t *sock, void *data, switch_size_t len, switch_sockaddr_t *from_addr)
 {
        stun_packet_t *packet;
        stun_packet_attribute_t *attr;

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index 8994c7e5d5addd88c73bf21bbdcd6ec1f7493be5..d97ea19b297c4df3787d53f9876b116e580c6a89 100644 (file)
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -245,7 +245,7 @@ SWITCH_DECLARE(int) switch_rtp_read(switch_rtp *rtp_session, void *data, uint32_
        }
        memcpy(data, rtp_session->recv_msg.body, bytes);
        *payload_type = rtp_session->recv_msg.header.pt;
-       return bytes - rtp_header_len;
+       return (int)(bytes - rtp_header_len);
 
 }
 
@@ -274,7 +274,7 @@ SWITCH_DECLARE(int) switch_rtp_zerocopy_read(switch_rtp *rtp_session, void **dat
        *payload_type = rtp_session->recv_msg.header.pt;
        *data = rtp_session->recv_msg.body;
 
-       return bytes - rtp_header_len;
+       return (int)(bytes - rtp_header_len);
 }
 
 SWITCH_DECLARE(int) switch_rtp_write(switch_rtp *rtp_session, void *data, int datalen, uint32_t ts)