mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-27 10:40:34 +00:00
Code Issues 1 Projects Releases Wiki Activity

netbuffer: _netaddress_ -> _net_address_

Browse source
This commit is contained in:
Wim Taymans 2011-10-31 02:39:48 +01:00
parent e2015eeb5f
commit 4e6563d91c
2 changed files with 34 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gst-libs/gst/netbuffer/gstnetbuffer.c
View file

@ -61,7 +61,7 @@ gst_net_address_meta_get_info (void)
} }
/** /**
* gst_netaddress_set_ip4_address: * gst_net_address_set_ip4_address:
* @naddr: a network address * @naddr: a network address
* @address: an IPv4 network address. * @address: an IPv4 network address.
* @port: a port number to set. * @port: a port number to set.
@ -72,7 +72,7 @@ gst_net_address_meta_get_info (void)
* use g_htons() and g_htonl() to convert them to network byte order. * use g_htons() and g_htonl() to convert them to network byte order.
*/ */
void void
gst_netaddress_set_ip4_address (GstNetAddress * naddr, guint32 address, gst_net_address_set_ip4_address (GstNetAddress * naddr, guint32 address,
guint16 port) guint16 port)
{ {
g_return_if_fail (naddr != NULL); g_return_if_fail (naddr != NULL);
@ -83,7 +83,7 @@ gst_netaddress_set_ip4_address (GstNetAddress * naddr, guint32 address,
} }
/** /**
* gst_netaddress_set_ip6_address: * gst_net_address_set_ip6_address:
* @naddr: a network address * @naddr: a network address
* @address: an IPv6 network address. * @address: an IPv6 network address.
* @port: a port number to set. * @port: a port number to set.
@ -94,7 +94,7 @@ gst_netaddress_set_ip4_address (GstNetAddress * naddr, guint32 address,
* it to network byte order. * it to network byte order.
*/ */
void void
gst_netaddress_set_ip6_address (GstNetAddress * naddr, guint8 address[16], gst_net_address_set_ip6_address (GstNetAddress * naddr, guint8 address[16],
guint16 port) guint16 port)
{ {
g_return_if_fail (naddr != NULL); g_return_if_fail (naddr != NULL);
@ -105,7 +105,7 @@ gst_netaddress_set_ip6_address (GstNetAddress * naddr, guint8 address[16],
} }
/** /**
* gst_netaddress_get_net_type: * gst_net_address_get_net_type:
* @naddr: a network address * @naddr: a network address
* *
* Get the type of address stored in @naddr. * Get the type of address stored in @naddr.
@ -113,7 +113,7 @@ gst_netaddress_set_ip6_address (GstNetAddress * naddr, guint8 address[16],
* Returns: the network type stored in @naddr. * Returns: the network type stored in @naddr.
*/ */
GstNetType GstNetType
gst_netaddress_get_net_type (const GstNetAddress * naddr) gst_net_address_get_net_type (const GstNetAddress * naddr)
{ {
g_return_val_if_fail (naddr != NULL, GST_NET_TYPE_UNKNOWN); g_return_val_if_fail (naddr != NULL, GST_NET_TYPE_UNKNOWN);
@ -121,7 +121,7 @@ gst_netaddress_get_net_type (const GstNetAddress * naddr)
} }
/** /**
* gst_netaddress_get_ip4_address: * gst_net_address_get_ip4_address:
* @naddr: a network address * @naddr: a network address
* @address: a location to store the address. * @address: a location to store the address.
* @port: a location to store the port. * @port: a location to store the port.
@ -135,7 +135,7 @@ gst_netaddress_get_net_type (const GstNetAddress * naddr)
* Returns: TRUE if the address could be retrieved. * Returns: TRUE if the address could be retrieved.
*/ */
gboolean gboolean
gst_netaddress_get_ip4_address (const GstNetAddress * naddr, guint32 * address, gst_net_address_get_ip4_address (const GstNetAddress * naddr, guint32 * address,
guint16 * port) guint16 * port)
{ {
g_return_val_if_fail (naddr != NULL, FALSE); g_return_val_if_fail (naddr != NULL, FALSE);
@ -152,7 +152,7 @@ gst_netaddress_get_ip4_address (const GstNetAddress * naddr, guint32 * address,
} }
/** /**
* gst_netaddress_get_ip6_address: * gst_net_address_get_ip6_address:
* @naddr: a network address * @naddr: a network address
* @address: a location to store the result. * @address: a location to store the result.
* @port: a location to store the port. * @port: a location to store the port.
@ -168,8 +168,8 @@ gst_netaddress_get_ip4_address (const GstNetAddress * naddr, guint32 * address,
* Returns: TRUE if the address could be retrieved. * Returns: TRUE if the address could be retrieved.
*/ */
gboolean gboolean
gst_netaddress_get_ip6_address (const GstNetAddress * naddr, guint8 address[16], gst_net_address_get_ip6_address (const GstNetAddress * naddr,
guint16 * port) guint8 address[16], guint16 * port)
{ {
static guint8 ip4_transition[16] = static guint8 ip4_transition[16] =
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF }; { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0xFF, 0xFF };
@ -193,7 +193,7 @@ gst_netaddress_get_ip6_address (const GstNetAddress * naddr, guint8 address[16],
} }
/** /**
* gst_netaddress_get_address_bytes: * gst_net_address_get_address_bytes:
* @naddr: a network address * @naddr: a network address
* @address: a location to store the result. * @address: a location to store the result.
* @port: a location to store the port. * @port: a location to store the port.
@ -208,7 +208,7 @@ gst_netaddress_get_ip6_address (const GstNetAddress * naddr, guint8 address[16],
* Since: 0.10.22 * Since: 0.10.22
*/ */
gint gint
gst_netaddress_get_address_bytes (const GstNetAddress * naddr, gst_net_address_get_address_bytes (const GstNetAddress * naddr,
guint8 address[16], guint16 * port) guint8 address[16], guint16 * port)
{ {
gint ret = 0; gint ret = 0;
@ -234,7 +234,7 @@ gst_netaddress_get_address_bytes (const GstNetAddress * naddr,
} }
/** /**
* gst_netaddress_set_address_bytes: * gst_net_address_set_address_bytes:
* @naddr: a network address * @naddr: a network address
* @type: the address type (IPv4 or IPV6) * @type: the address type (IPv4 or IPV6)
* @address: a location to store the result. * @address: a location to store the result.
@ -251,7 +251,7 @@ gst_netaddress_get_address_bytes (const GstNetAddress * naddr,
* Since: 0.10.22 * Since: 0.10.22
*/ */
gint gint
gst_netaddress_set_address_bytes (GstNetAddress * naddr, GstNetType type, gst_net_address_set_address_bytes (GstNetAddress * naddr, GstNetType type,
guint8 address[16], guint16 port) guint8 address[16], guint16 port)
{ {
gint len = 0; gint len = 0;
@ -278,7 +278,7 @@ gst_netaddress_set_address_bytes (GstNetAddress * naddr, GstNetType type,
} }
/** /**
* gst_netaddress_equal: * gst_net_address_equal:
* @naddr1: The first #GstNetAddress * @naddr1: The first #GstNetAddress
* @naddr2: The second #GstNetAddress * @naddr2: The second #GstNetAddress
* *
@ -289,7 +289,7 @@ gst_netaddress_set_address_bytes (GstNetAddress * naddr, GstNetType type,
* Since: 0.10.18 * Since: 0.10.18
*/ */
gboolean gboolean
gst_netaddress_equal (const GstNetAddress * naddr1, gst_net_address_equal (const GstNetAddress * naddr1,
const GstNetAddress * naddr2) const GstNetAddress * naddr2)
{ {
g_return_val_if_fail (naddr1 != NULL, FALSE); g_return_val_if_fail (naddr1 != NULL, FALSE);
@ -318,7 +318,7 @@ gst_netaddress_equal (const GstNetAddress * naddr1,
} }
/** /**
* gst_netaddress_to_string: * gst_net_address_to_string:
* @naddr: a #GstNetAddress * @naddr: a #GstNetAddress
* @dest: destination * @dest: destination
* @len: len of @dest * @len: len of @dest
@ -332,7 +332,8 @@ gst_netaddress_equal (const GstNetAddress * naddr1,
* Since: 0.10.24 * Since: 0.10.24
*/ */
gint gint
gst_netaddress_to_string (const GstNetAddress * naddr, gchar * dest, gulong len) gst_net_address_to_string (const GstNetAddress * naddr, gchar * dest,
gulong len)
{ {
gint result; gint result;
@ -345,7 +346,7 @@ gst_netaddress_to_string (const GstNetAddress * naddr, gchar * dest, gulong len)
guint32 address; guint32 address;
guint16 port; guint16 port;
gst_netaddress_get_ip4_address (naddr, &address, &port); gst_net_address_get_ip4_address (naddr, &address, &port);
address = g_ntohl (address); address = g_ntohl (address);
result = g_snprintf (dest, len, "%d.%d.%d.%d:%d", (address >> 24) & 0xff, result = g_snprintf (dest, len, "%d.%d.%d.%d:%d", (address >> 24) & 0xff,
@ -358,7 +359,7 @@ gst_netaddress_to_string (const GstNetAddress * naddr, gchar * dest, gulong len)
guint8 address[16]; guint8 address[16];
guint16 port; guint16 port;
gst_netaddress_get_ip6_address (naddr, address, &port); gst_net_address_get_ip6_address (naddr, address, &port);
result = result =
g_snprintf (dest, len, "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]:%d", g_snprintf (dest, len, "[%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x]:%d",

20
gst-libs/gst/netbuffer/gstnetbuffer.h
View file

@ -44,7 +44,7 @@ typedef enum {
* GST_NETADDRESS_MAX_LEN: * GST_NETADDRESS_MAX_LEN:
* *
* The maximum length of a string representation of a GstNetAddress as produced * The maximum length of a string representation of a GstNetAddress as produced
* by gst_netaddress_to_string(). * by gst_net_address_to_string().
* *
* Since: 0.10.24 * Since: 0.10.24
*/ */
@ -89,20 +89,20 @@ const GstMetaInfo *gst_net_address_meta_get_info (void);
((GstNetAddressMeta*)gst_buffer_add_meta((b),GST_NET_ADDRESS_META_INFO,NULL)) ((GstNetAddressMeta*)gst_buffer_add_meta((b),GST_NET_ADDRESS_META_INFO,NULL))
/* address operations */ /* address operations */
void gst_netaddress_set_ip4_address (GstNetAddress *naddr, guint32 address, guint16 port); void gst_net_address_set_ip4_address (GstNetAddress *naddr, guint32 address, guint16 port);
void gst_netaddress_set_ip6_address (GstNetAddress *naddr, guint8 address[16], guint16 port); void gst_net_address_set_ip6_address (GstNetAddress *naddr, guint8 address[16], guint16 port);
gint gst_netaddress_set_address_bytes (GstNetAddress *naddr, GstNetType type, gint gst_net_address_set_address_bytes (GstNetAddress *naddr, GstNetType type,
guint8 address[16], guint16 port); guint8 address[16], guint16 port);
GstNetType gst_netaddress_get_net_type (const GstNetAddress *naddr); GstNetType gst_net_address_get_net_type (const GstNetAddress *naddr);
gboolean gst_netaddress_get_ip4_address (const GstNetAddress *naddr, guint32 *address, guint16 *port); gboolean gst_net_address_get_ip4_address (const GstNetAddress *naddr, guint32 *address, guint16 *port);
gboolean gst_netaddress_get_ip6_address (const GstNetAddress *naddr, guint8 address[16], guint16 *port); gboolean gst_net_address_get_ip6_address (const GstNetAddress *naddr, guint8 address[16], guint16 *port);
gint gst_netaddress_get_address_bytes (const GstNetAddress *naddr, guint8 address[16], guint16 *port); gint gst_net_address_get_address_bytes (const GstNetAddress *naddr, guint8 address[16], guint16 *port);
gboolean gst_netaddress_equal (const GstNetAddress *naddr1, gboolean gst_net_address_equal (const GstNetAddress *naddr1,
const GstNetAddress *naddr2); const GstNetAddress *naddr2);
gint gst_netaddress_to_string (const GstNetAddress *naddr, gchar *dest, gulong len); gint gst_net_address_to_string (const GstNetAddress *naddr, gchar *dest, gulong len);
G_END_DECLS G_END_DECLS