mqtt/src/daemon.c - diff

Return to daemon.c CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / mqtt / src

Diff for /mqtt/src/daemon.c between versions 1.1.2.5 and 1.1.2.13

-version 1.1.2.5, 2011/12/01 08:45:01
+version 1.1.2.13, 2011/12/09 11:46:48
  Line 1
  #include "global.h"
+ #include "mqttd.h"
+ extern char cliCmd[], *cliStr[];
  static void *
  startSession(sched_task_t *task)
  {
+         u_char basebuf[USHRT_MAX];
+         mqtt_cb_t cbs[MQTT_TYPE_MAX + 1] = { 0 };
+         mqtt_msg_t buf = { basebuf, sizeof basebuf };
+         mqtthdr_connflgs_t flg;
+         mqtthdr_connack_t cack;
+         int ret = 0;
+         struct timeval tv = { 0 };
+         u_short ka;
+         struct tagSession *sess = NULL;
+         FTRACE(4);
+         sess = malloc(sizeof(struct tagSession));
+         if (!sess) {
+                 VERB(3) syslog(LOG_ERR, "Error:: in malloc #%d - %s", errno, strerror(errno));
+                 goto end;
+         }
+         if (recv(TASK_FD(task), buf.msg_base, buf.msg_len, 0) == -1) {
+                 VERB(3) syslog(LOG_ERR, "Error:: recv(%d) #%d - %s", (int) TASK_FD(task),
+                                 errno, strerror(errno));
+                 goto end;
+         }
+         cack = mqtt_readCONNECT(&buf, &ka, sess->sess_cid, sizeof sess->sess_cid,
+                         sess->sess_user, sizeof sess->sess_user, sess->sess_pass, sizeof sess->sess_pass,
+                         &sess->sess_will.topic, &sess->sess_will.msg);
+         if (cack.reserved) {
+                 VERB(3) syslog(LOG_ERR, "Error:: in MQTT protocol #%d - %s", mqtt_GetErrno(), mqtt_GetError());
+                 goto end;
+         }
+         /* check online table for user */
+ end:    /* close client connection */
+         if (sess)
+                 free(sess);
          close(TASK_FD(task));
          VERB(1) syslog(LOG_DEBUG, "Close client %s with socket=%d",
                          (char*) TASK_ARG(task), (int) TASK_FD(task));
          if (TASK_ARG(task))
                  free(TASK_ARG(task));
-        return 0;
+        return NULL;
  }
  /* ----------------------------------------------------------------------- */

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.2.5
changed lines
	Added in v.1.1.2.13