Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:rhabacker:branches:windows:mingw:win32
mingw32-farstream2
farstream-0.2.4.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File farstream-0.2.4.patch of Package mingw32-farstream2
--- farstream/fs-session.h +++ farstream/fs-session.h @@ -64,7 +64,6 @@ */ typedef enum _FsDTMFEvent { - /*< protected >*/ FS_DTMF_EVENT_0 = 0, FS_DTMF_EVENT_1 = 1, FS_DTMF_EVENT_2 = 2, --- gst/fsmsnconference/fs-msn-connection.c +++ gst/fsmsnconference/fs-msn-connection.c @@ -30,12 +30,19 @@ #include "fs-msn-connection.h" +#ifdef _WIN32 +#include <winsock2.h> +#include <windows.h> +#define strerror_r(code, msg, msg_size) strerror_s((msg), (msg_size), (code)) +typedef int socklen_t; +#else #include <arpa/inet.h> +#include <netinet/in.h> +#include <sys/socket.h> +#endif #include <errno.h> #include <fcntl.h> -#include <netinet/in.h> #include <string.h> -#include <sys/socket.h> #include <unistd.h> #include <stdio.h> #ifdef HAVE_STDLIB_H @@ -484,8 +491,10 @@ goto error; } +#ifndef _WIN32 // set non-blocking mode fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK); +#endif for (;;) { GST_DEBUG ("Attempting to listen on port %d.....",port); memset(&myaddr, 0, sizeof(myaddr)); @@ -532,7 +541,7 @@ done: - if (getsockname (fd, (struct sockaddr *) &myaddr, &myaddr_len) < 0) { + if (getsockname (fd, (struct sockaddr *) &myaddr, (void*)&myaddr_len) < 0) { gchar error_str[256]; strerror_r (errno, error_str, 256); g_set_error (error, FS_ERROR, FS_ERROR_NETWORK, @@ -600,8 +609,10 @@ return FALSE; } +#ifndef _WIN32 // set non-blocking mode fcntl(fd, F_SETFL, fcntl(fd, F_GETFL) | O_NONBLOCK); +#endif theiraddr.sin_family = AF_INET; theiraddr.sin_addr.s_addr = inet_addr (candidate->ip); --- gst/fsmsnconference/fs-msn-stream.c +++ gst/fsmsnconference/fs-msn-stream.c @@ -49,10 +49,15 @@ #include "fs-msn-stream.h" +#ifdef _WIN32 +#include <winsock2.h> +#include <ws2tcpip.h> +#else #include <arpa/inet.h> -#include <fcntl.h> #include <netinet/in.h> #include <sys/socket.h> +#endif +#include <fcntl.h> #include <string.h> #include <unistd.h> @@ -828,12 +833,12 @@ if (self->priv->fd < 0) return; - if (setsockopt (self->priv->fd, IPPROTO_IP, IP_TOS, &tos, sizeof (tos)) < 0) + if (setsockopt (self->priv->fd, IPPROTO_IP, IP_TOS, (const void *)&tos, sizeof (tos)) < 0) GST_WARNING ( "could not set socket ToS: %s", g_strerror (errno)); #ifdef IPV6_TCLASS if (setsockopt (self->priv->fd, IPPROTO_IPV6, IPV6_TCLASS, - &tos, sizeof (tos)) < 0) + (const void *)&tos, sizeof (tos)) < 0) GST_WARNING ("could not set TCLASS: %s", g_strerror (errno)); #endif } --- gst/fsmsnconference/Makefile.am +++ gst/fsmsnconference/Makefile.am @@ -42,7 +42,8 @@ $(FS_LIBS) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ - $(NICE_LIBS) + $(NICE_LIBS) \ + -lws2_32 --- gst/fsrtpconference/fs-rtp-codec-specific.c +++ gst/fsrtpconference/fs-rtp-codec-specific.c @@ -1484,8 +1484,8 @@ local_level_idc = 0xFF & local_value; nego_level_idc = MIN (remote_level_idc, local_level_idc); - g_snprintf (buf, 7, "%02hhX%02hhX%02hhX", local_profile_idc, nego_profile_iop, - nego_level_idc); + g_snprintf (buf, 7, "%02hX%02hX%02hX", local_profile_idc & 0xFF, nego_profile_iop & 0xFF, + nego_level_idc & 0xFF); fs_codec_add_optional_parameter (negotiated_codec, sdp_param->name, buf); --- transmitters/multicast/fs-multicast-transmitter.c +++ transmitters/multicast/fs-multicast-transmitter.c @@ -687,12 +687,12 @@ } if (setsockopt (sock, IPPROTO_IP, IP_TOS, - &type_of_service, sizeof (type_of_service)) < 0) + (const void*)&type_of_service, sizeof (type_of_service)) < 0) GST_WARNING ("could not set socket ToS: %s", g_strerror (errno)); #ifdef IPV6_TCLASS if (setsockopt (sock, IPPROTO_IPV6, IPV6_TCLASS, - &type_of_service, sizeof (type_of_service)) < 0) + (const void*)&type_of_service, sizeof (type_of_service)) < 0) GST_WARNING ("could not set TCLASS: %s", g_strerror (errno)); #endif @@ -1223,12 +1223,12 @@ UdpSock *udpsock = item->data; if (setsockopt (udpsock->fd, IPPROTO_IP, IP_TOS, - &tos, sizeof (tos)) < 0) + (const void*)&tos, sizeof (tos)) < 0) GST_WARNING ( "could not set socket tos: %s", g_strerror (errno)); #ifdef IPV6_TCLASS if (setsockopt (udpsock->fd, IPPROTO_IPV6, IPV6_TCLASS, - &tos, sizeof (tos)) < 0) + (const void*)&tos, sizeof (tos)) < 0) GST_WARNING ("could not set TCLASS: %s", g_strerror (errno)); #endif } --- transmitters/multicast/Makefile.am +++ transmitters/multicast/Makefile.am @@ -21,7 +21,8 @@ $(FS_LIBS) \ $(GST_BASE_LIBS) \ $(GST_LIBS) \ - $(GIO_LIBS) + $(GIO_LIBS) \ + -lws2_32 noinst_HEADERS = \ fs-multicast-transmitter.h \ --- transmitters/rawudp/fs-rawudp-transmitter.c +++ transmitters/rawudp/fs-rawudp-transmitter.c @@ -618,11 +618,11 @@ fd = g_socket_get_fd (socket); - if (setsockopt (fd, IPPROTO_IP, IP_TOS, &tos, sizeof (tos)) < 0) + if (setsockopt (fd, IPPROTO_IP, IP_TOS, (const void *)&tos, sizeof (tos)) < 0) GST_WARNING ("could not set socket ToS: %s", g_strerror (errno)); #ifdef IPV6_TCLASS - if (setsockopt (fd, IPPROTO_IPV6, IPV6_TCLASS, &tos, sizeof (tos)) < 0) + if (setsockopt (fd, IPPROTO_IPV6, IPV6_TCLASS, (const void *)&tos, sizeof (tos)) < 0) GST_WARNING ("could not set TCLASS: %s", g_strerror (errno)); #endif @@ -1299,11 +1299,11 @@ UdpPort *udpport = item->data; int fd = g_socket_get_fd (udpport->socket); - if (setsockopt (fd, IPPROTO_IP, IP_TOS, &tos, sizeof (tos)) < 0) + if (setsockopt (fd, IPPROTO_IP, IP_TOS, (const void *)&tos, sizeof (tos)) < 0) GST_WARNING ( "could not set socket ToS: %s", g_strerror (errno)); #ifdef IPV6_TCLASS - if (setsockopt (fd, IPPROTO_IPV6, IPV6_TCLASS, &tos, sizeof (tos)) < 0) + if (setsockopt (fd, IPPROTO_IPV6, IPV6_TCLASS, (const void *)&tos, sizeof (tos)) < 0) GST_WARNING ("could not set TCLASS: %s", g_strerror (errno)); #endif } --- transmitters/rawudp/Makefile.am +++ transmitters/rawudp/Makefile.am @@ -27,7 +27,8 @@ $(NICE_LIBS) \ $(GUPNP_LIBS) \ $(GIO_LIBS) \ - -lgstnet-@GST_API_VERSION@ + -lgstnet-@GST_API_VERSION@ \ + -lws2_32 noinst_HEADERS = \ fs-rawudp-transmitter.h \
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
