SDOCM00117774: IPSec Inflow tests are getting failed on all platforms with error...

diff --git a/ti/runtime/netapi/utils/netapi_util_rm.c b/ti/runtime/netapi/utils/netapi_util_rm.c
old mode 100755 (executable)
new mode 100644 (file)
index 0794956..9d8dd61
--- a/ti/runtime/netapi/utils/netapi_util_rm.c
+++ b/ti/runtime/netapi/utils/netapi_util_rm.c
@@ -48,9 +48,9 @@
 
 /* Socket Includes */
 #include "sockutils.h"
-#include "sockrmmsg.h"
 
 /* RM Includes */
+#include <ti/drv/rm/rm_server_if.h>
 #include <ti/drv/rm/rm.h>
 #include <ti/drv/rm/rm_transport.h>
 #include <ti/drv/rm/rm_services.h>

diff --git a/ti/runtime/netapi/utils/sockrmmsg.h b/ti/runtime/netapi/utils/sockrmmsg.h
deleted file mode 100755 (executable)
index d3dbbec..0000000
--- a/ti/runtime/netapi/utils/sockrmmsg.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com/
- *
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions
- *  are met:
- *
- *    Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- *    Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the
- *    distribution.
- *
- *    Neither the name of Texas Instruments Incorporated nor the names of
- *    its contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *  "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *  LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *  A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *  OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef __SOCKRMMSG_H__
-#define __SOCKRMMSG_H__
-
-#include <stdint.h>
-
-#define RM_SERVER_SOCKET_NAME "/tmp/var/run/rm/rm_server"
-
-#define msg_alloc(p) \
-       do { \
-               p = calloc(1, sizeof(*p)); \
-               if (p) { \
-                       p->length = sizeof(*p); \
-               } \
-       } while (0)
-               
-#define msg_length(x) ((x) ? (sizeof(*x) + x->length) : 0)
-#define msg_data(x) ((x->length) ? ((char *)x + sizeof(*x)) : NULL)
-
-#endif /* __SOCKRMMSG_H__ */

diff --git a/ti/runtime/netapi/utils/sockutils.c b/ti/runtime/netapi/utils/sockutils.c
old mode 100755 (executable)
new mode 100644 (file)
index 5992bd3..13933b8
--- a/ti/runtime/netapi/utils/sockutils.c
+++ b/ti/runtime/netapi/utils/sockutils.c
@@ -171,6 +171,10 @@ int sock_send (sock_h handle, const char *data, int length,
 
     }
 
+    if (!sd) {
+        close(fd);
+    }
+
     return 0;
 }
 

diff --git a/ti/runtime/netapi/utils/sockutils.h b/ti/runtime/netapi/utils/sockutils.h
old mode 100755 (executable)
new mode 100644 (file)
index dc5d811..ad83e08
--- a/ti/runtime/netapi/utils/sockutils.h
+++ b/ti/runtime/netapi/utils/sockutils.h
@@ -44,26 +44,27 @@
 
 
 typedef enum {
-       sock_name_e,
-       sock_addr_e
+    sock_name_e,
+    sock_addr_e
 } sock_name_type;
 
 typedef struct {
-       sock_name_type type;
-       union sock {
-               char *name;
-               struct sockaddr_un *addr;
-       } s;
+    sock_name_type type;
+    union sock {
+        char *name;
+        struct sockaddr_un *addr;
+    } s;
 } sock_name_t;
 
 #define sock_h void *
 
+int check_and_create_path (char *path);
 sock_h sock_open (sock_name_t *sock_name);
 
 int sock_close (sock_h handle);
 
 int sock_send (sock_h handle, const char *data, int length,
-                       sock_name_t *to);
+               sock_name_t *to);
 
 /* Returns: 1 => success (external FD), 0 => success, -1 => error, -2 => timeout */
 int sock_wait (sock_h handle, int *size, struct timeval *timeout, int extern_fd);