Author: rco
Date: 2008-04-10 10:52:38 +0200 (Thu, 10 Apr 2008)
New Revision: 878
Modified:
trunk/core/AmRtpStream.cpp
trunk/core/AmUtils.h
trunk/core/sems.cpp
Log:
- fixed more Darwin stuff: basic SEMS stuff work on Mac OS X now :-)
Modified: trunk/core/AmRtpStream.cpp
===================================================================
--- trunk/core/AmRtpStream.cpp 2008-04-10 00:29:41 UTC (rev 877)
+++ trunk/core/AmRtpStream.cpp 2008-04-10 08:52:38 UTC (rev 878)
@@ -367,9 +367,14 @@
memcpy(&r_saddr,&ss,sizeof(struct sockaddr_storage));
set_port_v6(&r_saddr,port);
+
#else
struct sockaddr_in sa;
memset (&sa, 0, sizeof (sa));
+
+#ifdef BSD44SOCKETS
+ sa.sin_len = sizeof(sockaddr_in);
+#endif
sa.sin_family = AF_INET;
sa.sin_port = htons(port);
Modified: trunk/core/AmUtils.h
===================================================================
--- trunk/core/AmUtils.h 2008-04-10 00:29:41 UTC (rev 877)
+++ trunk/core/AmUtils.h 2008-04-10 08:52:38 UTC (rev 878)
@@ -286,22 +286,8 @@
/** add a directory to an environement variable */
void add_env_path(const char* name, const string& path);
-#ifdef SUPPORT_IPV6
-#ifdef SIN6_LEN
-#define SOCKADDR_LEN(soc_address) ((struct sockaddr *)&soc_address)->sa_len
-#else
-#ifndef SA_LEN
-#define SA_LEN(x) (((x)->sa_family == AF_INET6)?sizeof(struct sockaddr_in6): \
- (((x)->sa_family == AF_INET)?sizeof(struct sockaddr_in):sizeof(struct
sockaddr)))
#endif
-#define SOCKADDR_LEN(soc_address) SA_LEN((struct sockaddr *)&soc_address)
-#endif /* SIN6_LEN */
-#else
-#define SOCKADDR_LEN(soc_address) sizeof(soc_address)
-#endif /* SUPPORT_IPV6 */
-#endif
-
// Local Variables:
// mode:C++
// End:
Modified: trunk/core/sems.cpp
===================================================================
--- trunk/core/sems.cpp 2008-04-10 00:29:41 UTC (rev 877)
+++ trunk/core/sems.cpp 2008-04-10 08:52:38 UTC (rev 878)
@@ -436,7 +436,7 @@
exit(-1);
}
-#ifdef __linux__
+#if !defined(BSD44SOCKETS)
int n_dev = ifc.ifc_len / sizeof(struct ifreq);
for(int i=0; i<n_dev; i++){
if(ifrs[i].ifr_addr.sa_family==PF_INET){
@@ -445,7 +445,7 @@
inet_ntoa(sa->sin_addr)));
}
}
-#else
+#else // defined(BSD44SOCKETS)
struct ifreq* p_ifr = ifc.ifc_req;
while((char*)p_ifr - (char*)ifc.ifc_req < ifc.ifc_len){
@@ -455,7 +455,7 @@
inet_ntoa(sa->sin_addr)));
}
- p_ifr = (struct ifreq*)(((char*)p_ifr) + IFNAMSIZ +
SOCKADDR_LEN(p_ifr->ifr_addr));
+ p_ifr = (struct ifreq*)(((char*)p_ifr) + IFNAMSIZ +
p_ifr->ifr_addr.sa_len);
}
#endif
}
_______________________________________________
Semsdev mailing list
[email protected]
http://lists.iptel.org/mailman/listinfo/semsdev
