lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-22 02:53:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

avoid potentially context name falling into harbor id

Browse Source
This commit is contained in:
Kezhu Wang
2012-08-05 16:44:04 +08:00
parent bc55b8d992
commit 058499446d
1 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
skynet_harbor.c
View File

@@ -313,6 +313,36 @@ _report_zmq_error(int rc) {
}
}
static int
_isdecimal(int c) {
return c>='0' && c<='9';
}
// Name-updating protocols:
//
// 1) harbor_id=harbor_address
// 2) context_name=context_handle
static int
_split_name(uint8_t *buf, int len, int *np) {
uint8_t *sep;
if (len > 0 && _isdecimal(buf[0])) {
int i=0;
int n=0;
do {
n = n*10 + (buf[i]-'0');
} while(++i<len && _isdecimal(buf[i]));
if (i < len && buf[i] == '=') {
buf[i] = '\0';
*np = n;
return i;
}
} else if ((sep = memchr(buf, '=', len)) != NULL) {
*sep = '\0';
return (int)(sep-buf);
}
return -1;
}
// Always in main harbor thread
static void
_name_update() {
@@ -321,17 +351,11 @@ _name_update() {
int rc = zmq_recv(Z->zmq_local,&content,0);
_report_zmq_error(rc);
int sz = zmq_msg_size(&content);
int i;
int n = 0;
uint8_t * buffer = zmq_msg_data(&content);
for (i=0;i<sz;i++) {
if (buffer[i] == '=') {
buffer[i] = '\0';
break;
}
n = n * 10 + (buffer[i] - '0');
}
if (i==sz) {
int n = 0;
int i = _split_name(buffer, sz, &n);
if (i == -1) {
char tmp[sz+1];
memcpy(tmp,buffer,sz);
tmp[sz] = '\0';