Changeset 392
- Timestamp:
- 09/04/09 10:57:30 (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/merlin/src/monitor.c
r335 r392 52 52 } 53 53 54 static int secmon_auth_client(uchar * ucrc)54 static int monitor_secure_auth_client(uchar * ucrc) 55 55 { 56 56 ulong crc; … … 132 132 return (buf[0] = 0); 133 133 } 134 if (! secmon_auth_client(buf + 1))134 if (!monitor_secure_auth_client(buf + 1)) 135 135 return (buf[0] = 0); 136 136 aes_decrypt(buf + 5, 16); 137 137 bsize = boundary(4, buf[9] + 5) + 5; 138 // 138 // cs_log("n=%d bsize=%d", n, bsize); 139 139 if (n > bsize) { 140 // 140 // cs_log("DO >>>> copy-back"); 141 141 memcpy(bbuf, buf + bsize, bpos = n - bsize); 142 142 n = bsize; … … 214 214 } 215 215 216 static int cs_idx2ridx(int idx)216 static int monitor_idx2ridx(int idx) 217 217 { 218 218 int i; … … 256 256 case 'p': 257 257 case 'r': 258 if ((i = cs_idx2ridx(idx)) < 0) // should never happen258 if ((i = monitor_idx2ridx(idx)) < 0) // should never happen 259 259 ctyp = (client[idx].typ == 'p') ? "proxy" : "reader"; 260 260 else { … … 322 322 isec = now - client[i].last; 323 323 usr = client[i].usr; 324 if (((client[i].typ == 'r') || (client[i].typ == 'p')) && (con = cs_idx2ridx(i)) >= 0)324 if (((client[i].typ == 'r') || (client[i].typ == 'p')) && (con = monitor_idx2ridx(i)) >= 0) 325 325 usr = reader[con].label; 326 326 if (client[i].dup)
Note:
See TracChangeset
for help on using the changeset viewer.