Changeset 209a00c674b57f182fb47fca9b1ad306a7165793

Timestamp:

06/11/06 18:29:07 (2 years ago)

Author:

Rémi Denis-Courmont <rem@videolan.org>

git-committer:

Rémi Denis-Courmont <rem@videolan.org> 1162834147 +0000

git-parent:

[0dc1ef3e1d35207d7ae301ee04e4dea5210694c2]

git-author:

Rémi Denis-Courmont <rem@videolan.org> 1162834147 +0000

Message:

Cleanup

Files:

• include/network.h (modified) (2 diffs)
• include/vlc_symbols.h (modified) (3 diffs)
• src/network/io.c (modified) (2 diffs)
• src/network/udp.c (modified) (1 diff)

include/network.h

@@ -90 +90 @@
-VLC_EXPORT( int, __net_ConnectTCP, ( vlc_object_t *p_this, const char *psz_host, int i_port ) );
-
-
-
+
+
+
+
-
-#define net_ListenTCP(a, b, c) __net_ListenTCP(VLC_OBJECT(a), b, c)
@@ -102 +104 @@
-VLC_EXPORT( int, __net_ConnectUDP, ( vlc_object_t *p_this, const char *psz_host, int i_port, int hlim ) );
-
-
+
+
+
+
-
-#define net_OpenUDP(a, b, c, d, e ) __net_OpenUDP(VLC_OBJECT(a), b, c, d, e)

include/vlc_symbols.h

@@ -555 +555 @@
-    char * (*config_ChainCreate_inner) (char **, config_chain_t **, char *);
-    int (*utf8_open_inner) (const char *filename, int flags, mode_t mode);
-    int (*net_ListenUDP1_inner) (vlc_object_t *obj, const char *host, int port);
-};
-# if defined (__PLUGIN__)
@@ -1033 +1032 @@
-#  define config_ChainCreate (p_symbols)->config_ChainCreate_inner
-#  define utf8_open (p_symbols)->utf8_open_inner
-#  define net_ListenUDP1 (p_symbols)->net_ListenUDP1_inner
-# elif defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
-/******************************************************************
@@ -1514 +1512 @@
-    ((p_symbols)->config_ChainCreate_inner) = config_ChainCreate; \
-    ((p_symbols)->utf8_open_inner) = utf8_open; \
-    ((p_symbols)->net_ListenUDP1_inner) = net_ListenUDP1; \
-    (p_symbols)->net_ConvertIPv4_deprecated = NULL; \
-    (p_symbols)->__sout_CfgParse_deprecated = NULL; \

src/network/io.c

@@ -115 +115 @@
-
-
-int *net_Listen (vlc_object_t *p_this, const char *psz_host, int i_por
-
+static int *net_Listen (vlc_object_t *p_this, const char *psz_hos
+       int i_port, 
-{
-    struct addrinfo hints, *res;
@@ -234 +234 @@
-
-
+int net_ListenSingle (vlc_object_t *obj, const char *host, int port,
+                      int family, int socktype, int protocol)
+{
+    int *fdv = net_Listen (obj, host, port, family, socktype, protocol);
+    if (fdv == NULL)
+        return -1;
+
+    for (unsigned i = 1; fdv[i] != -1; i++)
+    {
+        msg_Warn (obj, "A socket has been dropped!");
+        net_Close (fdv[i]);
+    }
+
+    int fd = fdv[0];
+    assert (fd != -1);
+
+    free (fdv);
+    return fd;
+}
+
+
+
-/*****************************************************************************
- * __net_Close:

src/network/udp.c

@@ -403 +403 @@
-
-
-static inline
-int *__net_ListenUDP (vlc_object_t *obj, const char *host, int port)
-{
-    int *fdv = net_Listen (obj, host, port, 0, SOCK_DGRAM, IPPROTO_UDP);
-    if (fdv == NULL)
-        return NULL;
-
-    /* FIXME: handle multicast subscription */
-    return fdv;
-}
-
-
-int net_ListenUDP1 (vlc_object_t *obj, const char *host, int port)
-{
-    int *fdv = __net_ListenUDP (obj, host, port);
-    if (fdv == NULL)
-        return -1;
-
-    for (unsigned i = 1; fdv[i] != -1; i++)
-    {
-        msg_Warn (obj, "A socket has been dropped!");
-        net_Close (fdv[i]);
-    }
-
-    int fd = fdv[0];
-    assert (fd != -1);
-
-    free (fdv);
-    return fd;
-}
-
-
-/*****************************************************************************
- * __net_OpenUDP: