Changeset fbb3c3d6fb9c744f61f735225baaa7003b9d62a5

Timestamp:

06/16/00 16:04:06 (8 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 961164246 +0000

git-parent:

[e1e77d20763acbcb91bdb0e96b3cba343eb28fbd]

git-author:

Sam Hocevar <sam@videolan.org> 961164246 +0000

Message:

. le code des VLAN devrait refonctionner

Files:

• src/input/input_vlan.c (modified) (5 diffs)

src/input/input_vlan.c

@@ -31 +31 @@
-#include <string.h>                                   /* strerror(), bzero() */
-#include <stdlib.h>                                                /* free() */
+#include <sys/time.h>                             /* timeval */
-
-#if defined(SYS_BSD) || defined(SYS_BEOS)
@@ -69 +70 @@
- * Local prototypes
- *****************************************************************************/
-static int ZeTrucMucheFunction( int Channel );
-
-/*****************************************************************************
@@ -120 +120 @@
-
-/*****************************************************************************
+ * input_VlanLeave: leave a vlan
+ *****************************************************************************
+ * This function tells the vlan library that the designed interface is no more
+ * locked and than vlan changes can occur.
+ *****************************************************************************/
+void input_VlanLeave( int i_vlan_id )
+{
+    /* XXX?? */
+}
+
+/*****************************************************************************
- * input_VlanJoin: join a vlan
- *****************************************************************************
@@ -135 +146 @@
-    return( -1 );
-#else
+
+#define SERVER "138.195.130.90"
+#define INTERFACE "eth0"
+/* default server port */
+#define VLANSERVER_PORT 6010
+    
+    int                 socket_cl;
+    int                 fromlen;
+    struct ifreq        interface;
+    struct sockaddr_in  sa_server;
+    struct sockaddr_in  sa_client;
+    unsigned int        version = 12;
+    char                mess[80];
+    struct timeval     *date_cl;
+    struct timeval      time;
+    long unsigned int   date;
+    int                 nbanswer;
+    char                answer;
+    fd_set              rfds;
+
-    /* If last change is too recent, wait a while */
-    if( mdate() - p_main->p_vlan->last_change < INPUT_VLAN_CHANGE_DELAY )
@@ -145 +176 @@
-
-    intf_Msg("Joining VLAN %d (channel %d)\n", i_vlan_id + 2, i_vlan_id );
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-/*****************************************************************************
- * input_VlanLeave: leave a vlan
- *****************************************************************************
- * This function tells the vlan library that the designed interface is no more
- * locked and than vlan changes can occur.
- *****************************************************************************/
-void input_VlanLeave( int i_vlan_id )
-{
-    /* XXX?? */
-}
-
-/* following functions are local */
-
-static int ZeTrucMucheFunction( int Channel)
-{
-#ifdef SYS_LINUX
-    int                         i_socket;
-    char   *                    ipaddr;
-    struct ifreq                interface;
-    struct sockaddr_in          sa_server;
-    struct sockaddr_in          sa_client;
-    char                        mess[80];
-
-    /*
-     *Looking for informations about the eth0 interface
-     */
-
-    interface.ifr_addr.sa_family = AF_INET;
-    strcpy( interface.ifr_name, main_GetPszVariable( INPUT_IFACE_VAR, INPUT_IFACE_DEFAULT ) );
-
-    i_socket = socket( AF_INET, SOCK_DGRAM, 0 );
-
-    /* Looking for the interface IP address */
-    ioctl( i_socket, SIOCGIFDSTADDR, &interface );
-    ipaddr = inet_ntoa((*(struct sockaddr_in *)(&(interface.ifr_addr))).sin_addr );
-
-    /* Looking for the interface MAC address */
-    ioctl( i_socket, SIOCGIFHWADDR, &interface );
-    close( i_socket );
-
-    /*
-     * Getting address, port, ... of the server
-     */
-
-    /* Initialize */
-    bzero( &sa_server, sizeof(struct sockaddr_in) );
-    /* sin_family is ALWAYS set to AF_INET (see in man 7 ip)*/
-    sa_server.sin_family = AF_INET;
-    /* Giving port on to connect after having convert it*/
-    sa_server.sin_port = htons ( main_GetIntVariable( INPUT_VLAN_PORT_VAR, INPUT_VLAN_PORT_DEFAULT ));
-    /* Giving address after having convert it into binary data*/
-    inet_aton( main_GetPszVariable( INPUT_VLAN_SERVER_VAR, INPUT_VLAN_SERVER_DEFAULT ), &(sa_server.sin_addr) );
-
-    /*
-     * Getting address, port, ... of the client
-     */
-
-    /* Initialize */
-    bzero( &sa_client, sizeof(struct sockaddr_in) );
-    /* sin_family is ALWAYS set to AF_INET (see in man 7 ip)*/
-    sa_client.sin_family = AF_INET;
-    /* Giving port on to connect after having convert it*/
-    sa_client.sin_port = htons( 0 );
-    /* Giving address after having convert it into binary data*/
-    inet_aton( ipaddr, &(sa_client.sin_addr) );
-
-    /* Initialization of the socket */
-    i_socket = socket(AF_INET, SOCK_DGRAM, 17 ); /* XXX?? UDP */
-     /*  SOCK_DGRAM because here we use DATAGRAM
-      * Sachant qu'il y a un #define AF_INET = PF_INET dans sys/socket.h et que PF_INET est le IP protocol family ...
-      * Protocol is in #define, should be 17 for udp */
-
-    /* Elaborate the message to send */
-        sprintf( mess , "%d %s %2.2x%2.2x%2.2x%2.2x%2.2x%2.2x %2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x \n",
-            Channel, ipaddr,
-            interface.ifr_hwaddr.sa_data[0] & 0xff,
-            interface.ifr_hwaddr.sa_data[1] & 0xff,
-            interface.ifr_hwaddr.sa_data[2] & 0xff,
-            interface.ifr_hwaddr.sa_data[3] & 0xff,
-            interface.ifr_hwaddr.sa_data[4] & 0xff,
-            interface.ifr_hwaddr.sa_data[5] & 0xff,
-                    interface.ifr_hwaddr.sa_data[0] & 0xff,
-            interface.ifr_hwaddr.sa_data[1] & 0xff,
-            interface.ifr_hwaddr.sa_data[2] & 0xff,
-            interface.ifr_hwaddr.sa_data[3] & 0xff,
-            interface.ifr_hwaddr.sa_data[4] & 0xff,
-            interface.ifr_hwaddr.sa_data[5] & 0xff
-        );
-
-    /* Send the message */
-    intf_DbgMsg("%s\n", mess);
-        sendto(i_socket,mess,80,0,(struct sockaddr *)&sa_server,sizeof(struct sockaddr));
-
-    /*Close the socket */
-    close( i_socket );
-#endif
-
-    return 0;
-}