Diff: eth.cpp

Revision:

122:480c44b0e205

Parent:

121:ee02790d00b7

Child:

124:c1b6c893e1c3

diff -r ee02790d00b7 -r 480c44b0e205 eth.cpp
--- a/eth.cpp	Fri May 08 04:15:23 2015 +0000
+++ b/eth.cpp	Mon May 11 15:16:36 2015 +0000
@@ -1,77 +1,63 @@
-#include "header_app_includes.h"
+#include "eth.h"
 
 EthernetInterface eth;
 
 int __init_eth__ ( void )
 {    
-    debug_msg("");
     static bool initialized = false;
-    char buff_ip[ 16 ] = "";
-    char buff_msk[ 16 ] = "";
-    char buff_gtw[ 16 ] = "";
+    
+    char buff_ip [ 16 ] = "";
+    char buff_msk [ 16 ] = "";
+    char buff_gtw [ 16 ] = "";
+    
     if( debug_uart3 ) pc.printf("\n\r");
-    debug_msg("");
+    
+    int ip_return_value = get_ip ( buff_ip, sizeof ( buff_ip ) - 1  );
     
-    // ler o ip aqui
+    if ( ip_return_value < 0 )
+    {
+        set_ip( MY_IP );
+        
+        strncpy ( buff_ip, MY_IP, sizeof ( buff_ip ) - 1  );
+        
+        if ( debug_file ) debug_msg ("Load default header_ip -- %s", buff_ip );
+    }
     
+    buff_ip [ sizeof ( buff_ip ) - 1 ] = 0;
+    
+    int mask_return_value = get_ip ( buff_msk, sizeof ( buff_msk ) - 1  );
     
-    FILE * fp = fopen( "/qspi/mymask.txt", "r");
-    if( fp == NULL ){
-        if( debug_file ) debug_msg("Failed to open /qspi/mymask.txt" );
-        strncpy( buff_msk, MY_MSK, 20 );    
-    }else{
-        int read = fread( buff_msk, 1, 512, fp );
-        if( read > 0 ){
-            for( int i = 0; i < read; i++ ) 
-                if( buff_msk[ i ] == '\n' || buff_msk[ i ] == '\r' ){
-                    buff_msk[ i ] = '\0';
-                    break;
-                }
-            if( debug_file ) debug_msg("mascara de rede Eth %s", buff_msk );
-        }else{
-            if( debug_file ) debug_msg("Failed to read /qspi/mymask.txt" );
-            strncpy( buff_msk, MY_MSK, 20 );
-        }
+    if ( mask_return_value < 0 )
+    {
+        set_mask( MY_MSK );
+        
+        strncpy ( buff_msk, MY_MSK, sizeof ( buff_msk ) - 1  );
+        
+        if ( debug_file ) debug_msg ("Load default eth_mask -- %s", buff_msk );
     }
-    if ( fp ) fclose( fp );
-    buff_msk[ 15 ] = 0;
+    
+    buff_msk [ sizeof ( buff_msk ) - 1 ] = 0;
     
-    debug_msg("");
-    fp = fopen( "/qspi/mygateway.txt", "r");
-    if( fp == NULL ){
-        if( debug_file ) debug_msg("Failed to open /qspi/mygateway.txt" );
-        strncpy( buff_gtw, MY_GTW, 20 );    
-    }else{
-        int read = fread( buff_gtw, 1, 512, fp );
-        if( read > 0 ){
-            for( int i = 0; i < read; i++ ) 
-                if( buff_gtw[ i ] == '\n' || buff_gtw[ i ] == '\r' ){
-                    buff_gtw[ i ] = '\0';
-                    break;
-                }
-            if( debug_file ) debug_msg("Ip Gateway Eth %s", buff_gtw );
-        }else{
-            if( debug_file ) debug_msg("Failed to read /qspi/mygateway.txt" );
-            strncpy( buff_gtw, MY_GTW, 20 );
-        }
+    int gw_return_value = get_gateway ( buff_gtw, sizeof ( buff_gtw ) - 1  );
+    
+    if ( gw_return_value < 0 )
+    {
+        set_gateway( MY_GTW );
+        
+        strncpy ( buff_gtw, MY_MSK, sizeof ( buff_gtw ) - 1  );
+        
+        if ( debug_file ) debug_msg ("Load default eth_gateway -- %s", buff_gtw );
     }
-    if ( fp ) fclose( fp );
-    buff_gtw[ 15 ] = 0;
     
-    debug_msg("");
+    buff_gtw [ sizeof ( buff_gtw ) - 1 ] = 0;
     
     if( !initialized )
     {
-        debug_msg("buff_ip :: %s -- buff_msk :: %s -- buff_gtw :: %s", buff_ip, buff_msk, buff_gtw );
         eth.init( buff_ip, buff_msk, buff_gtw );
-        debug_msg("");
         initialized = true;
-        debug_msg("");
         return eth.connect();
     }
     
-    debug_msg("");
-    
     if( !eth.disconnect() ){
         return eth.connect();
     }