version 1.2.2.31, 2012/05/14 13:04:14
|
version 1.2.2.34, 2012/05/28 08:08:21
|
Line 16 initSession(int sock, ait_val_t * __restrict v)
|
Line 16 initSession(int sock, ait_val_t * __restrict v)
|
if (!v) |
if (!v) |
return NULL; |
return NULL; |
|
|
sess = malloc(sizeof(struct tagSession)); | sess = io_malloc(sizeof(struct tagSession)); |
if (!sess) { |
if (!sess) { |
ioSYSERR(0); |
ioSYSERR(0); |
return NULL; |
return NULL; |
Line 34 initSession(int sock, ait_val_t * __restrict v)
|
Line 34 initSession(int sock, ait_val_t * __restrict v)
|
sess->sess_buf = mqtt_msgAlloc(USHRT_MAX); |
sess->sess_buf = mqtt_msgAlloc(USHRT_MAX); |
if (!sess->sess_buf) { |
if (!sess->sess_buf) { |
ioLIBERR(mqtt); |
ioLIBERR(mqtt); |
free(sess); | io_free(sess); |
return NULL; |
return NULL; |
} |
} |
|
|
Line 43 initSession(int sock, ait_val_t * __restrict v)
|
Line 43 initSession(int sock, ait_val_t * __restrict v)
|
if (!sess->sess_srv) { |
if (!sess->sess_srv) { |
ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError()); |
ioDEBUG(3, "Error:: in srv_Init #%d - %s", mqtt_GetErrno(), mqtt_GetError()); |
mqtt_msgFree(&sess->sess_buf, 42); |
mqtt_msgFree(&sess->sess_buf, 42); |
free(sess); | io_free(sess); |
return NULL; |
return NULL; |
} else { |
} else { |
mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT); |
mqtt_srv_setCmd(sess->sess_srv, MQTT_TYPE_CONNECT, cmdCONNECT); |
Line 87 finiSession(struct tagSession *sess)
|
Line 87 finiSession(struct tagSession *sess)
|
if (store->st_subscr.sub_value.msg_base) |
if (store->st_subscr.sub_value.msg_base) |
free(store->st_subscr.sub_value.msg_base); |
free(store->st_subscr.sub_value.msg_base); |
|
|
free(store); | io_free(store); |
} |
} |
|
|
if (sess->sess_will.msg) |
if (sess->sess_will.msg) |
Line 101 finiSession(struct tagSession *sess)
|
Line 101 finiSession(struct tagSession *sess)
|
mqtt_srv_Fini(&sess->sess_srv); |
mqtt_srv_Fini(&sess->sess_srv); |
mqtt_msgFree(&sess->sess_buf, 42); |
mqtt_msgFree(&sess->sess_buf, 42); |
|
|
free(sess); | io_free(sess); |
} |
} |
|
|
static void * |
static void * |
Line 122 leaveClient(sched_task_t *task)
|
Line 122 leaveClient(sched_task_t *task)
|
ret = mqtt_msgDISCONNECT(sess->sess_buf); |
ret = mqtt_msgDISCONNECT(sess->sess_buf); |
send(TASK_FD(task), sess->sess_buf->msg_base, ret, MSG_NOSIGNAL); |
send(TASK_FD(task), sess->sess_buf->msg_base, ret, MSG_NOSIGNAL); |
|
|
ioDEBUG(1, "Close socket=%d", TASK_FD(task)); | ioDEBUG(1, "Close socket=%ld", (long) TASK_FD(task)); |
call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, |
call.LOG(logg, "Session %s stopped from %s for user %s.\n", sess->sess_cid, |
sess->sess_addr, sess->sess_user); |
sess->sess_addr, sess->sess_user); |
|
|
Line 289 startSession(sched_task_t *task)
|
Line 289 startSession(sched_task_t *task)
|
end: /* close client connection */ |
end: /* close client connection */ |
wlen = mqtt_msgCONNACK(sess->sess_buf, ret); |
wlen = mqtt_msgCONNACK(sess->sess_buf, ret); |
if ((wlen = send(TASK_FD(task), sess->sess_buf->msg_base, wlen, 0)) == -1) { |
if ((wlen = send(TASK_FD(task), sess->sess_buf->msg_base, wlen, 0)) == -1) { |
ioDEBUG(3, "Error:: send(%d) #%d - %s", TASK_FD(task), errno, strerror(errno)); | ioDEBUG(3, "Error:: send(%ld) #%d - %s", (long) TASK_FD(task), errno, strerror(errno)); |
} else |
} else |
ioDEBUG(5, "Sended %d bytes", wlen); |
ioDEBUG(5, "Sended %d bytes", wlen); |
|
|
if (ret != MQTT_RETCODE_ACCEPTED) { |
if (ret != MQTT_RETCODE_ACCEPTED) { |
ioDEBUG(1, "Close client %s with socket=%d", sess->sess_addr, TASK_FD(task)); | ioDEBUG(1, "Close client %s with socket=%ld", sess->sess_addr, (long) TASK_FD(task)); |
finiSession(sess); |
finiSession(sess); |
} |
} |
return NULL; |
return NULL; |
Line 347 end:
|
Line 347 end:
|
int |
int |
Run(int sock) |
Run(int sock) |
{ |
{ |
struct tagPub *pub; |
|
struct tagSession *sess; |
struct tagSession *sess; |
struct timespec pl = { 0, 100000000 }; |
struct timespec pl = { 0, 100000000 }; |
|
|
Line 369 Run(int sock)
|
Line 368 Run(int sock)
|
schedRun(root, &Kill); |
schedRun(root, &Kill); |
|
|
/* free all undeleted elements into lists */ |
/* free all undeleted elements into lists */ |
TAILQ_FOREACH(pub, &Pubs, pub_node) { |
|
TAILQ_REMOVE(&Pubs, pub, pub_node); |
|
|
|
AIT_FREE_VAL(&pub->pub_name); |
|
if (pub->pub_packet.msg_base) |
|
free(pub->pub_packet.msg_base); |
|
} |
|
TAILQ_FOREACH(sess, &Sessions, sess_node) { |
TAILQ_FOREACH(sess, &Sessions, sess_node) { |
TAILQ_REMOVE(&Sessions, sess, sess_node); |
TAILQ_REMOVE(&Sessions, sess, sess_node); |
|
|