libaitmqtt/inc/mqttapi.h - diff

Return to mqttapi.h CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / libaitmqtt / inc

Diff for /libaitmqtt/inc/mqttapi.h between versions 1.1.2.5 and 1.2.4.1

version 1.1.2.5, 2012/05/01 01:12:16	version 1.2.4.1, 2012/06/29 08:22:49
Line 53 SUCH DAMAGE.	Line 53 SUCH DAMAGE.
#ifdef API_SERVER_SIDE	#ifdef API_SERVER_SIDE
/* MQTT server structure & hooks */	/* MQTT server structure & hooks */

/* MQTT command callback. 1st argument is (mqtt_srv_t) server handle /	/* MQTT command callback. 1st argument is (mqtt_srv_t) server handle, 2nd is ready length /
typedef int (mqtt_cb_t)(void /mqtt_srv_t/, void );	typedef int (mqtt_cb_t)(void /mqtt_srv_t/, int, void );
typedef struct {	typedef struct {
mqtt_cb_t cmds[MQTT_TYPE_MAX];	mqtt_cb_t cmds[MQTT_TYPE_MAX];

int sock;	int sock;
	unsigned short timeout;
mqtt_msg_t *buf;	mqtt_msg_t *buf;
} mqtt_srv_t;	} mqtt_srv_t;
#define mqtt_srv_setCmd(x, _cmd, _func) (assert((x)), (x)->cmds[(_cmd)] = (_func))	#define mqtt_srv_setCmd(x, _cmd, _func) (assert((x)), (x)->cmds[(_cmd)] = (_func))
Line 66 typedef struct {	Line 67 typedef struct {


/*	/*
* mqtt_srv_Init() Init server side actor	* mqtt_srv_cliInit() Init MQTT server side support for clients
*	*
* @sock = Client socket from accept()	* @sock = Client socket from accept()
* @buf = Message buffer	* @buf = Message buffer
	* @timeout = timeout
* return: NULL error or !=NULL allocated server handle	* return: NULL error or !=NULL allocated server handle
*/	*/
mqtt_srv_t mqtt_srv_Init(int sock, mqtt_msg_t __restrict buf);	mqtt_srv_t mqtt_srv_cliInit(int sock, mqtt_msg_t __restrict buf, unsigned short timeout);
/*	/*
* mqtt_srv_Fini() Finish MQTT server side support	* mqtt_srv_Fini() Finish MQTT server side support for clients
*	*
* @psrv = Server handle	* @psrv = Server handle
* return: none	* return: none
*/	*/
void mqtt_srv_Fini(mqtt_srv_t ** __restrict psrv);	void mqtt_srv_cliFini(mqtt_srv_t ** __restrict psrv);
/*	/*
* mqtt_srv_Dispatch() MQTT server dispatcher	* mqtt_srv_Dispatch() MQTT server dispatcher for clients
*	*
* @srv = Server handle	* @srv = Server handle
	* @rlen = Ready bytes to parse
* @arg = Argument pass to command callback	* @arg = Argument pass to command callback
* return: -1 error or 0 ok	* return: -1 error or 0 ok
*/	*/
int mqtt_srv_Dispatch(mqtt_srv_t * __restrict srv, void *arg);	int mqtt_srv_cliDispatch(mqtt_srv_t * __restrict srv, int rlen, void *arg);

	/*
	* mqtt_srv_Create() - Create server socket
	*
	* @sa = Server bind address
	* @salen = Server struct sockaddr size
	* return: -1 error or >-1 server socket
	*/
	int mqtt_srv_Create(struct sockaddr * __restrict sa, int salen);
	/*
	* mqtt_srv_Destroy() - Close server socket
	*
	* @sock = Server socket
	* return: -1 error or 0 ok
	*/
	int mqtt_srv_Destroy(int sock);
	/*
	* mqtt_srv_Listen() - Listen server socket
	*
	* @sock = Server socket
	* @maxconn = max number of pending connections
	* @nb = Non block socket
	* return: -1 error or 0 ok
	*/
	int mqtt_srv_Listen(int sock, int maxconn, int nb);
#endif	#endif

/*	/*
Line 106 int mqtt_KeepAlive(int sock, unsigned short ka, unsign	Line 134 int mqtt_KeepAlive(int sock, unsigned short ka, unsign

typedef struct {	typedef struct {
int sock;	int sock;
	unsigned short timeout;
mqtt_msg_t *buf;	mqtt_msg_t *buf;
} mqtt_cli_t;	} mqtt_cli_t;

Line 114 typedef struct {	Line 143 typedef struct {
* mqtt_cli_Open() - Open client connection to MQTT broker	* mqtt_cli_Open() - Open client connection to MQTT broker
*	*
* @addr = brokers address	* @addr = brokers address
	* @timeout = timeout
* return: NULL error or !=NULL connected to broker	* return: NULL error or !=NULL connected to broker
*/	*/
mqtt_cli_t mqtt_cli_Open(struct sockaddr addr);	mqtt_cli_t mqtt_cli_Open(struct sockaddr addr, unsigned short timeout);
/*	/*
* mqtt_cli_Close() - Close client connection	* mqtt_cli_Close() - Close client connection
*	*
Line 124 mqtt_cli_t mqtt_cli_Open(struct sockaddr addr);	Line 154 mqtt_cli_t mqtt_cli_Open(struct sockaddr addr);
* return: -1 error or 0 disconnected client and freed all resources	* return: -1 error or 0 disconnected client and freed all resources
*/	*/
int mqtt_cli_Close(mqtt_cli_t ** __restrict cli);	int mqtt_cli_Close(mqtt_cli_t ** __restrict cli);

	/*
	* mqtt_cli_Subscribe() - Subscribe to broker
	*
	* @cli = connected client
	* @Topics = Topics for subscribes
	* @msgID = Message ID
	* @Dup = Duplicated request
	* @QoS = Message QoS
	* return: NULL error or !=NULL allocated array with subscribed QoS responses,
	* must be free() result!
	*/
	unsigned char mqtt_cli_Subscribe(mqtt_cli_t __restrict cli,
	mqtt_subscr_t * __restrict Topics, unsigned short msgID,
	unsigned char Dup, unsigned char QoS);
	/*
	* mqtt_cli_Unsubscribe() - Unsubscribe from broker
	*
	* @cli = connected client
	* @Topics = Topics for unsubscribes
	* @msgID = Message ID
	* @Dup = Duplicated request
	* @QoS = Message QoS
	* return: -1 error or 0 ok
	*/
	int mqtt_cli_Unsubscribe(mqtt_cli_t * __restrict cli,
	mqtt_subscr_t * __restrict Topics, unsigned short msgID,
	unsigned char Dup, unsigned char QoS);
	/*
	* mqtt_cli_Publish() - Publish message to broker
	*
	* @cli = connected client
	* @msgID = Message ID
	* @Dup = Duplicated request
	* @QoS = Message QoS
	* @Retain = Retain message
	* @csTopic = Topic
	* @pData = Data
	* @datLen = Data length
	* return: -1 error or > -1 sended bytes
	*/
	int mqtt_cli_Publish(mqtt_cli_t * __restrict cli, unsigned short msgID,
	unsigned char Dup, unsigned char QoS, unsigned char Retain,
	const char csTopic, const void pData, int datLen);
#endif	#endif

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

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