From 327741a21a1b1fcadc37e3aa1f294b12d8ba8f30 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Fri, 25 Apr 2008 13:31:48 +0000 Subject: gst/: Use GLib versions of htonl, htons, ntohl and ntohs in order to avoid problems on win32 (#529707). Original commit message from CVS: * gst/rtp/gstasteriskh263.c: (gst_asteriskh263_chain): * gst/udp/gstmultiudpsink.c: (gst_multiudpsink_add_internal): * gst/udp/gstudpsrc.c: (gst_udpsrc_start): Use GLib versions of htonl, htons, ntohl and ntohs in order to avoid problems on win32 (#529707). --- gst/udp/gstmultiudpsink.c | 4 ++-- gst/udp/gstudpsrc.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'gst/udp') diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c index 1ec8f63a..6c23874a 100644 --- a/gst/udp/gstmultiudpsink.c +++ b/gst/udp/gstmultiudpsink.c @@ -626,7 +626,7 @@ gst_multiudpsink_add_internal (GstMultiUDPSink * sink, const gchar * host, memset (&client->theiraddr, 0, sizeof (client->theiraddr)); memset (&client->multi_addr, 0, sizeof (client->multi_addr)); client->theiraddr.sin_family = AF_INET; /* host byte order */ - client->theiraddr.sin_port = htons (port); /* short, network byte order */ + client->theiraddr.sin_port = g_htons (port); /* short, network byte order */ g_get_current_time (&now); client->connect_time = GST_TIMEVAL_TO_TIME (now); @@ -634,7 +634,7 @@ gst_multiudpsink_add_internal (GstMultiUDPSink * sink, const gchar * host, /* if its an IP address */ if (inet_aton (host, &addr)) { /* check if its a multicast address */ - if ((ntohl (addr.s_addr) & 0xf0000000) == 0xe0000000) { + if ((g_ntohl (addr.s_addr) & 0xf0000000) == 0xe0000000) { GST_DEBUG_OBJECT (sink, "multicast address detected"); client->multi_addr.imr_multiaddr.s_addr = addr.s_addr; client->multi_addr.imr_interface.s_addr = INADDR_ANY; diff --git a/gst/udp/gstudpsrc.c b/gst/udp/gstudpsrc.c index 53277687..2c0802a3 100644 --- a/gst/udp/gstudpsrc.c +++ b/gst/udp/gstudpsrc.c @@ -691,7 +691,7 @@ gst_udpsrc_start (GstBaseSrc * bsrc) memset (&src->myaddr, 0, sizeof (src->myaddr)); src->myaddr.sin_family = AF_INET; /* host byte order */ - src->myaddr.sin_port = htons (src->port); /* short, network byte order */ + src->myaddr.sin_port = g_htons (src->port); /* short, network byte order */ if (src->multi_addr.imr_multiaddr.s_addr) src->myaddr.sin_addr.s_addr = src->multi_addr.imr_multiaddr.s_addr; @@ -751,7 +751,7 @@ gst_udpsrc_start (GstBaseSrc * bsrc) sizeof (bc_val))) < 0) goto no_broadcast; - port = ntohs (my_addr.sin_port); + port = g_ntohs (my_addr.sin_port); GST_DEBUG_OBJECT (src, "bound, on port %d", port); if (port != src->port) { src->port = port; @@ -759,7 +759,7 @@ gst_udpsrc_start (GstBaseSrc * bsrc) g_object_notify (G_OBJECT (src), "port"); } - src->myaddr.sin_port = htons (src->port + 1); + src->myaddr.sin_port = g_htons (src->port + 1); if ((src->fdset = gst_poll_new (TRUE)) == NULL) goto no_fdset; -- cgit