Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/src/include/register.global.class.in

    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 2442 by niro, Thu Sep 3 13:28:24 2015 UTC revision 2507 by niro, Fri Sep 11 09:56:34 2015 UTC
    # Line 6  validate_client() Line 6  validate_client()
    6   local ip_address="$2"   local ip_address="$2"
    7   local serial   local serial
    8   local mtime   local mtime
    9   local cmd   local serial_id
    10     local os
    11     local tools
    12    
    13   if [[ -z ${mac_address} ]]   if [[ -z ${mac_address} ]]
    14   then   then
    # Line 21  validate_client() Line 23  validate_client()
    23   fi   fi
    24    
    25   decho "registering mac_address='${mac_address}'"   decho "registering mac_address='${mac_address}'"
    26     decho "registering ip_address='${ip_address}'"
    27    
    28   # first check if mac is registered   # first check if mac is registered
    29   serial=$(mysqldo "select serial from client_serials where mac='${mac_address}'")   serial=$(mysqldo "select serial from client_serials where mac='${mac_address}'")
    30    
    31     # current mtime
    32     mtime=$(date +%s)
    33    
    34   if [[ -z ${serial} ]]   if [[ -z ${serial} ]]
    35   then   then
      mtime=$(date +%s)  
       
    36   # 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)
    37   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();")
    38   fi   fi
    # Line 40  validate_client() Line 44  validate_client()
    44   decho "serial='${serial}'"   decho "serial='${serial}'"
    45   rvecho "${serial}"   rvecho "${serial}"
    46    
    47   cmd+="quiet"   SSLSAY_IP="${ip_address}"
      cmd+="register '${serial}'"  
      SSLSAY_IP="${IP}"  
    48   SSLSAY_PORT="6666"   SSLSAY_PORT="6666"
    49   nsslsay_fingerprint "${cmd}"   nsslsay_fingerprint "register '${serial}'"
    50    
    51     # register the client as online
    52     serial_id=$(mysqldo "select serial from state_connected where serial=${serial};")
    53     if [[ -n ${serial_id} ]]
    54     then
    55     mysqldo "update state_connected set ip='${ip_address}', mac='${mac_address}', mtime='${mtime}' where serial=${serial};"
    56     else
    57     mysqldo "insert into state_connected(serial,ip,mac,mtime) values('${serial}','${ip_address}','${mac_address}','${mtime}');"
    58     fi
    59    
    60     # update tools and os version info
    61     nsslsay_queue_init
    62     nsslsay_queue_add "nocolors"
    63     nsslsay_queue_add "get version.os"
    64     os=$(control_client "${serial}" run-queue)
    65     import_resource client_version "${serial}" os "${os}"
    66     nsslsay_queue_init
    67     nsslsay_queue_add "nocolors"
    68     nsslsay_queue_add "get version.tools"
    69     tools=$(control_client "${serial}" run-queue)
    70     import_resource client_version "${serial}" utils "${tools}"
    71    
    72     # run hardware detection
    73     if is_provided hardware
    74     then
    75     run_hardware_detect "${serial}"
    76     fi
    77    
    78   return 0   return 0
    79   fi   fi
    # Line 56  register_client() Line 85  register_client()
    85   local iface_ip   local iface_ip
    86   local iface   local iface
    87   local mac_address   local mac_address
      local cmd  
    88    
    89   control_server_ip=$(dns_to_ip ${MCORE_CONTROL_SERVER})   control_server_ip=$(dns_to_ip ${MCORE_CONTROL_SERVER})
    90   iface_ip=$(iface_for_remote_addr ${control_server_ip})   iface_ip=$(iface_for_remote_addr ${control_server_ip})
    # Line 69  register_client() Line 97  register_client()
    97   decho "mac_address='${mac_address}'"   decho "mac_address='${mac_address}'"
    98    
    99   decho "register '${mac_address}'"   decho "register '${mac_address}'"
    100     nsslsay_fingerprint "register '${mac_address}' '${iface_ip}'"
      cmd+="quiet"  
      cmd+="register '${mac_address}' '${iface_ip}'"  
      nsslsay_fingerprint "${cmd}"  
    101  }  }
    102    
    103  register_client_local()  register_client_local()
    # Line 85  register_client_local() Line 110  register_client_local()
    110   return 1   return 1
    111   fi   fi
    112    
    113     install -d "${MCORE_CONFIG_PATH}"
    114   CONFIG="${MCORE_CONFIG_PATH}/serial"   CONFIG="${MCORE_CONFIG_PATH}/serial"
    115   clearconfig   clearconfig
    116   addconfig "CLIENT_SERIAL=\"${serial}\""   addconfig "CLIENT_SERIAL=\"${serial}\""
    Legend:
    Removed from v.2442  
    changed lines
      Added in v.2507