Magellan Linux

Diff of /mcore-src/trunk/mcore-tools/src/include/register.global.class.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2439 by niro, Thu Sep 3 12:54:15 2015 UTC revision 2476 by niro, Thu Sep 10 08:04:33 2015 UTC
# Line 3  Line 3 
3  validate_client()  validate_client()
4  {  {
5   local mac_address="$1"   local mac_address="$1"
6     local ip_address="$2"
7   local serial   local serial
8   local mtime   local mtime
9     local serial_id
10    
11   if [[ -z ${mac_address} ]]   if [[ -z ${mac_address} ]]
12   then   then
# Line 12  validate_client() Line 14  validate_client()
14   return 1   return 1
15   fi   fi
16    
17     if [[ -z ${ip_address} ]]
18     then
19     eecho "Error: No ip_address given"
20     return 1
21     fi
22    
23   decho "registering mac_address='${mac_address}'"   decho "registering mac_address='${mac_address}'"
24     decho "registering ip_address='${ip_address}'"
25    
26   # first check if mac is registered   # first check if mac is registered
27   serial=$(mysqldo "select serial from client_serials where mac='${mac_address}'")   serial=$(mysqldo "select serial from client_serials where mac='${mac_address}'")
28    
29     # current mtime
30     mtime=$(date +%s)
31    
32   if [[ -z ${serial} ]]   if [[ -z ${serial} ]]
33   then   then
  mtime=$(date +%s)  
   
34   # request a new serial; one command now (cause must be done in the same session)   # request a new serial; one command now (cause must be done in the same session)
35   serial=$(mysqldo "insert into client_serials (mtime, mac) values('${mtime}','${mac_address}'); select last_insert_id();")   serial=$(mysqldo "insert into client_serials (mtime, mac) values('${mtime}','${mac_address}'); select last_insert_id();")
36   fi   fi
# Line 29  validate_client() Line 39  validate_client()
39   then   then
40   return 1   return 1
41   else   else
42   echo "serial='${serial}'"   decho "serial='${serial}'"
43     rvecho "${serial}"
44    
45     SSLSAY_IP="${ip_address}"
46     SSLSAY_PORT="6666"
47     nsslsay_fingerprint "register '${serial}'"
48    
49     # register the client as online
50     serial_id=$(mysqldo "select serial from state_connected where serial=${serial};")
51     if [[ -n ${serial_id} ]]
52     then
53     mysqldo "update state_connected set ip='${ip_address}', mac='${mac_address}', mtime='${mtime}' where serial=${serial};"
54     else
55     mysqldo "insert into state_connected(serial,ip,mac,mtime) values('${serial}','${ip_address}','${mac_address}','${mtime}');"
56     fi
57    
58   return 0   return 0
59   fi   fi
60  }  }
# Line 52  register_client() Line 77  register_client()
77   decho "mac_address='${mac_address}'"   decho "mac_address='${mac_address}'"
78    
79   decho "register '${mac_address}'"   decho "register '${mac_address}'"
80   nsslsay_fingerprint "register '${mac_address}'"   nsslsay_fingerprint "register '${mac_address}' '${iface_ip}'"
81    }
82    
83    register_client_local()
84    {
85     local serial="$1"
86    
87     if [[ -z ${serial} ]]
88     then
89     eecho "No serial given"
90     return 1
91     fi
92    
93     install -d "${MCORE_CONFIG_PATH}"
94     CONFIG="${MCORE_CONFIG_PATH}/serial"
95     clearconfig
96     addconfig "CLIENT_SERIAL=\"${serial}\""
97  }  }

Legend:
Removed from v.2439  
changed lines
  Added in v.2476