Changeset 286:a915b031414c in verona

Timestamp:

Jul 28, 2011 4:10:06 PM (22 months ago)

Author:

Vadim Lebedev <vadim@…>

Branch:

default

Message:

ortp COVERITY fixes

Location:

oRTP/src

Files:

• rtpsession.c (modified) (1 diff)
• rtpsession_inet.c (modified) (10 diffs)
• stun.c (modified) (4 diffs)
• utils.h (modified) (1 diff)

oRTP/src/rtpsession.c

@@ -1273 +1273 @@
 **/
 void rtp_session_release_sockets(RtpSession *session){
-        if (session->rtp.socket>=0) close_socket (session->rtp.socket);
-        if (session->rtcp.socket>=0) close_socket (session->rtcp.socket);
+        if (!rtp_session_using_transport(session, rtp) && sockisvalid(session->rtp.socket)) close_socket (session->rtp.socket);
+        if (!rtp_session_using_transport(session, rtcp) && sockisvalid(session->rtcp.socket)) close_socket (session->rtcp.socket);
         session->rtp.socket=-1;
         session->rtcp.socket=-1;

oRTP/src/rtpsession_inet.c

@@ -28 +28 @@
 #else
 #include "ortp-config.h" /*needed for HAVE_SYS_UIO_H */
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
 #endif
 
@@ -248 +251 @@
         int sockfamily;
         bool_t reuse_addr;
-        if (session->rtp.socket>=0){
+        if (sockisvalid(session->rtp.socket)){
                 /* don't rebind, but close before*/
                 rtp_session_release_sockets(session);
@@ -305 +308 @@
     
     // Don't do anything if socket hasn't been created yet
-    if (session->rtp.socket < 0) return 0;
+    if (!sockisvalid(session->rtp.socket)) return 0;
 
     switch (session->rtp.sockfamily) {
@@ -381 +384 @@
      
     // Don't do anything if socket hasn't been created yet
-    if (session->rtp.socket < 0) return 0;
+    if (!sockisvalid(session->rtp.socket)) return 0;
 
     switch (session->rtp.sockfamily) {
@@ -450 +453 @@
         
         // Don't do anything if socket hasn't been created yet
-        if (session->rtp.socket < 0) return 0;
+        if (!sockisvalid(session->rtp.socket)) return 0;
 
         // DSCP value is in the upper six bits of the TOS field
@@ -647 +650 @@
                 if (try_connect(session->rtp.socket,(struct sockaddr*)&session->rtp.rem_addr,session->rtp.rem_addrlen))
                         session->flags|=RTP_SOCKET_CONNECTED;
-                if (session->rtcp.socket>=0){
+                if (sockisvalid(session->rtcp.socket)){
                         if (try_connect(session->rtcp.socket,(struct sockaddr*)&session->rtcp.rem_addr,session->rtcp.rem_addrlen))
                                 session->flags|=RTCP_SOCKET_CONNECTED;
@@ -730 +733 @@
           }
 
-        if (session->rtp.socket>=0){
+        if (sockisvalid(session->rtp.socket)){
                 while (recvfrom(session->rtp.socket,(char*)trash,sizeof(trash),0,(struct sockaddr *)&from,&fromlen)>0){};
         }
-        if (session->rtcp.socket>=0){
+        if (sockisvalid(session->rtcp.socket)){
                 while (recvfrom(session->rtcp.socket,(char*)trash,sizeof(trash),0,(struct sockaddr*)&from,&fromlen)>0){};
         }
@@ -858 +861 @@
 
         if (session->rtcp.enabled &&
-                ( (sockfd>=0 && (session->rtcp.rem_addrlen>0 ||using_connected_socket))
+                ( (sockisvalid(sockfd) && (session->rtcp.rem_addrlen>0 ||using_connected_socket))
                         || rtp_session_using_transport(session, rtcp) ) ){
                 if (rtp_session_using_transport(session, rtcp)){
@@ -900 +903 @@
         mblk_t *mp;
         
-        if ((sockfd<0) && !rtp_session_using_transport(session, rtp)) return -1;  /*session has no sockets for the moment*/
+        if (!sockisvalid(sockfd) && !rtp_session_using_transport(session, rtp)) return -1;  /*session has no sockets for the moment*/
 
         while (1)
@@ -983 +986 @@
         mblk_t *mp;
 
-        if (session->rtcp.socket<0 && !rtp_session_using_transport(session, rtcp)) return -1;  /*session has no rtcp sockets for the moment*/
+        if (!sockisvalid(session->rtcp.socket) && !rtp_session_using_transport(session, rtcp)) return -1;  /*session has no rtcp sockets for the moment*/
         
 

oRTP/src/stun.c

@@ -200 +200 @@
 stunParseAtrUnknown( char* body, unsigned int hdrLen,  StunAtrUnknown *result )
 {
-   if ( hdrLen >= sizeof(result) )
+   if ( hdrLen >= sizeof(*result) )
    {
       ortp_error("stun: Incorrect size for SA_UNKNOWNATTRIBUTE");
@@ -255 +255 @@
 turnParseAtrChannelNumber( char* body, unsigned int hdrLen,  TurnAtrChannelNumber *result )
 {
-   if ( hdrLen >= sizeof(result) )
+   if ( hdrLen >= sizeof(*result) )
    {
       ortp_error("stun: Incorrect size for TA_CHANNELNUMBER");
@@ -276 +276 @@
 turnParseAtrLifetime( char* body, unsigned int hdrLen,  TurnAtrLifetime *result )
 {
-   if ( hdrLen != sizeof(result) )
+   if ( hdrLen != sizeof(*result) )
    {
       ortp_error("stun: Incorrect size for TA_LIFETIME");
@@ -400 +400 @@
    unsigned int size;
          ortp_debug("stun: Received stun message: %i bytes\n", bufLen);
-   memset(msg, 0, sizeof(msg));
+   memset(msg, 0, sizeof(*msg));
         
    if (sizeof(StunMsgHdr) > bufLen)

oRTP/src/utils.h

@@ -83 +83 @@
 #if defined(WIN32) || defined(_WIN32_WCE)
 #define is_would_block_error(errnum)    (errnum==WSAEWOULDBLOCK)
+#define sockisvalid(s) (s != ~0)
 #else
 #define is_would_block_error(errnum)    (errnum==EWOULDBLOCK || errnum==EAGAIN)
+#define sockisvalid(s) ((s) >= 0)
 #endif