From 8cf1abe537ec56504dc4b5f68c1cd5f26acc97fa Mon Sep 17 00:00:00 2001
From: Cedric Roux <cedric.roux@eurecom.fr>
Date: Tue, 29 Oct 2013 10:20:22 +0000
Subject: [PATCH] - Fallback to v4 sockets - Copy usefulll binaries to bin dir
when compiling
git-svn-id: http://svn.eurecom.fr/openair4G/trunk@4293 818b1a75-f10b-46b9-bf7c-635c3b92a50f
---
openair-cn/NAS/EURECOM-NAS/src/util/socket.c | 6 ++++--
openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile | 1 +
openair-cn/NAS/EURECOM-NAS/tst/network/Makefile | 1 +
openair-cn/NAS/EURECOM-NAS/tst/user/Makefile | 1 +
4 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/openair-cn/NAS/EURECOM-NAS/src/util/socket.c b/openair-cn/NAS/EURECOM-NAS/src/util/socket.c
index 12941ea8b5..9249890e27 100644
--- a/openair-cn/NAS/EURECOM-NAS/src/util/socket.c
+++ b/openair-cn/NAS/EURECOM-NAS/src/util/socket.c
@@ -133,7 +133,8 @@ void* socket_udp_open(int type, const char* host, const char* port)
else
{
/* Setup socket address options at the client side */
- socket_info.ai_family = AF_UNSPEC; /* Any address family */
+ socket_info.ai_family = AF_INET; /* Any address family */
+// socket_info.ai_flags |= AI_V4MAPPED; /* IPv4-mapped IPv6 address */
}
/*
@@ -180,7 +181,7 @@ void* socket_udp_open(int type, const char* host, const char* port)
/*
* Initiate a communication channel at the SERVER side
*/
- else
+ else {
if (type == SOCKET_SERVER)
{
/* Set socket options */
@@ -194,6 +195,7 @@ void* socket_udp_open(int type, const char* host, const char* port)
break; /* Bind succeed */
}
}
+ }
close (sfd);
}
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
index 8587ffcaec..c255eac14b 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
+++ b/openair-cn/NAS/EURECOM-NAS/tst/as_simulator/Makefile
@@ -20,6 +20,7 @@ all: $(TARGET)
$(TARGET): $(OBJS)
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ @$(CP) $@ $(BINDIR)
clean:
$(RM) $(OBJS) *.bak *~
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile b/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
index 2ec879459f..3266315035 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
+++ b/openair-cn/NAS/EURECOM-NAS/tst/network/Makefile
@@ -20,6 +20,7 @@ all: $(TARGET)
$(TARGET): $(OBJS)
$(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
+ @$(CP) $@ $(BINDIR)
clean:
$(RM) $(OBJS) *.bak *~
diff --git a/openair-cn/NAS/EURECOM-NAS/tst/user/Makefile b/openair-cn/NAS/EURECOM-NAS/tst/user/Makefile
index 269c8e91c6..f878d69b02 100644
--- a/openair-cn/NAS/EURECOM-NAS/tst/user/Makefile
+++ b/openair-cn/NAS/EURECOM-NAS/tst/user/Makefile
@@ -17,6 +17,7 @@ all: $(TARGET)
$(TARGET): $(OBJS)
$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+ @$(CP) $(TARGET) $(BINDIR)
clean:
$(RM) $(OBJS) *.bak *~
--
GitLab