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

Parent Directory | Revision Log | Patch

	revision 2442 by niro, Thu Sep 3 13:28:24 2015 UTC	revision 2497 by niro, Thu Sep 10 14:08:40 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
11	if [[ -z ${mac_address} ]]	if [[ -z ${mac_address} ]]
12	then	then
#	Line 21  validate_client()	Line 21  validate_client()
21	fi	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 40  validate_client()	Line 42  validate_client()
42	decho "serial='${serial}'"	decho "serial='${serial}'"
43	rvecho "${serial}"	rvecho "${serial}"
44
45	cmd+="quiet"	SSLSAY_IP="${ip_address}"
	cmd+="register '${serial}'"
	SSLSAY_IP="${IP}"
46	SSLSAY_PORT="6666"	SSLSAY_PORT="6666"
47	nsslsay_fingerprint "${cmd}"	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		# run hardware detection
59		if is_provided hardware
60		then
61		set_hardware_detect "${serial}"
62		fi
63
64	return 0	return 0
65	fi	fi
#	Line 56  register_client()	Line 71  register_client()
71	local iface_ip	local iface_ip
72	local iface	local iface
73	local mac_address	local mac_address
	local cmd
74
75	control_server_ip=$(dns_to_ip ${MCORE_CONTROL_SERVER})	control_server_ip=$(dns_to_ip ${MCORE_CONTROL_SERVER})
76	iface_ip=$(iface_for_remote_addr ${control_server_ip})	iface_ip=$(iface_for_remote_addr ${control_server_ip})
#	Line 69  register_client()	Line 83  register_client()
83	decho "mac_address='${mac_address}'"	decho "mac_address='${mac_address}'"
84
85	decho "register '${mac_address}'"	decho "register '${mac_address}'"
86		nsslsay_fingerprint "register '${mac_address}' '${iface_ip}'"
	cmd+="quiet"
	cmd+="register '${mac_address}' '${iface_ip}'"
	nsslsay_fingerprint "${cmd}"
87	}	}
88
89	register_client_local()	register_client_local()
#	Line 85  register_client_local()	Line 96  register_client_local()
96	return 1	return 1
97	fi	fi
98
99		install -d "${MCORE_CONFIG_PATH}"
100	CONFIG="${MCORE_CONFIG_PATH}/serial"	CONFIG="${MCORE_CONFIG_PATH}/serial"
101	clearconfig	clearconfig
102	addconfig "CLIENT_SERIAL=\"${serial}\""	addconfig "CLIENT_SERIAL=\"${serial}\""

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2442   changed lines   Added in v.2497