Timeout pour les changements de vlan

diff --git a/include/config.h b/include/config.h
index 416510391f85358fea64843c48038cf4ec37d282..d70c1f6eccde8cb0f9261ea0a2f99c3c176a4afb 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -211,6 +211,10 @@
 #define INPUT_VLAN_PORT_VAR             "vlc_vlan_port"
 #define INPUT_VLAN_PORT_DEFAULT         6010
 
+/* Delay between vlan changes - this is required to avoid flooding the VLAN 
+ * server */
+#define INPUT_VLAN_CHANGE_DELAY         5000000
+
 /*******************************************************************************
  * Audio configuration
  *******************************************************************************/

diff --git a/src/input/input_vlan.c b/src/input/input_vlan.c
index d7c6427f8a50d94de512cd5222d245eaa7570dcd..bc8ee9b112529d065b5b86d21c6b67d022e8b005 100644 (file)
--- a/src/input/input_vlan.c
+++ b/src/input/input_vlan.c
@@ -34,7 +34,8 @@
  *******************************************************************************/
 typedef struct input_vlan_s
 {    
-    int i_dummy;
+    int         i_vlan_id;                              /* current vlan number */
+    mtime_t     last_change;                               /* last change date */
 } input_vlan_t;
 
 /*******************************************************************************
@@ -59,6 +60,10 @@ int input_VlanCreate( void )
         return( 1 );        
     }
 
+    /* Initialize structure */
+    p_main->p_vlan->i_vlan_id   = 0;
+    p_main->p_vlan->last_change = 0;    
+
     intf_Msg("VLANs initialized\n");    
     return( 0 );    
 }
@@ -71,6 +76,12 @@ int input_VlanCreate( void )
  *******************************************************************************/
 void input_VlanDestroy( void )
 {
+    /* Return to default vlan */
+    if( p_main->p_vlan->i_vlan_id != 0 )
+    {
+        input_VlanJoin( 0 );        
+    }    
+    
     /* Free structure */
     free( p_main->p_vlan );        
 }
@@ -88,7 +99,16 @@ void input_VlanDestroy( void )
  *******************************************************************************/
 int input_VlanJoin( int i_vlan_id )
 {    
-    intf_Msg("Joining VLAN %d (channel %d)\n", i_vlan_id + 2, i_vlan_id );    
+    /* If last change is too recent, wait a while */
+    if( mdate() - p_main->p_vlan->last_change < INPUT_VLAN_CHANGE_DELAY )
+    {
+        intf_Msg("Waiting before changing VLAN...\n");
+        mwait( p_main->p_vlan->last_change + INPUT_VLAN_CHANGE_DELAY );        
+    }
+    p_main->p_vlan->last_change = mdate();
+    p_main->p_vlan->i_vlan_id = i_vlan_id;    
+
+    intf_Msg("Joining VLAN %d (channel %d)\n", i_vlan_id + 2, i_vlan_id );
     return( ZeTrucMucheFunction( i_vlan_id ) ); // ?? join vlan
 }
 
@@ -100,8 +120,7 @@ int input_VlanJoin( int i_vlan_id )
  *******************************************************************************/
 void input_VlanLeave( int i_vlan_id )
 {
-    intf_Msg("Leaving VLAN %d (channel %d)\n", i_vlan_id + 2, i_vlan_id );    
-    ZeTrucMucheFunction( 0 );    // ?? join default vlan
+    // ??
 }
 
 /* following functions are local */
@@ -115,7 +134,8 @@ static int ZeTrucMucheFunction( int Channel)
        struct sockaddr_in      sa_client;
         char mess[80];
 
-       
+       return( 0 );
+        
        /*      
         *Looking for informations about the eth0 interface
         */