Skip to content

Lib version #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sarvsav wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Lib version #18

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcbd136
Added libversion() to check major, minor, revision of mosquitto libra…
sarvsav Aug 9, 2014
55af048
Changed the parameters for libVersion(), now they are passed by refer…
sarvsav Aug 18, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions mosquitto.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ ZEND_BEGIN_ARG_INFO(Mosquitto_Client_callback_args, ZEND_SEND_BY_VAL)
#endif
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(Mosquitto_Client_libVersion_args, ZEND_SEND_BY_REF)
ZEND_ARG_INFO(0, major)
ZEND_ARG_INFO(0, minor)
ZEND_ARG_INFO(0, revision)
ZEND_END_ARG_INFO()

ZEND_BEGIN_ARG_INFO(Mosquitto_Client_setCredentials_args, ZEND_SEND_BY_VAL)
ZEND_ARG_INFO(0, username)
ZEND_ARG_INFO(0, password)
Expand Down Expand Up @@ -122,6 +128,33 @@ PHP_METHOD(Mosquitto_Client, __construct)
}
/* }}} */

/* {{{ Mosquitto\Client::libVersion() */
PHP_METHOD(Mosquitto_Client, libVersion)
{
zval *major = 0;
zval *minor = 0;
zval *revision = 0;
PHP_MOSQUITTO_ERROR_HANDLING();
if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "|zzz", &major, &minor, &revision) == FAILURE) {
PHP_MOSQUITTO_RESTORE_ERRORS();
RETURN_NULL();
}
PHP_MOSQUITTO_RESTORE_ERRORS();
if (major) {
convert_to_long(major);
ZVAL_LONG(major, LIBMOSQUITTO_MAJOR);
}
if (minor) {
convert_to_long(minor);
ZVAL_LONG(minor, LIBMOSQUITTO_MINOR);
}
if (revision) {
convert_to_long(revision);
ZVAL_LONG(revision, LIBMOSQUITTO_REVISION);
}
}
/* }}} */

/* {{{ Mosquitto\Client::setTlsCertificates() */
PHP_METHOD(Mosquitto_Client, setTlsCertificates)
{
Expand Down Expand Up @@ -1138,6 +1171,7 @@ static int php_mosquitto_pw_callback(char *buf, int size, int rwflag, void *user
/* {{{ mosquitto_client_methods */
const zend_function_entry mosquitto_client_methods[] = {
PHP_ME(Mosquitto_Client, __construct, Mosquitto_Client___construct_args, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR)
PHP_ME(Mosquitto_Client, libVersion, Mosquitto_Client_libVersion_args, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC)
PHP_ME(Mosquitto_Client, onConnect, Mosquitto_Client_callback_args, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, onDisconnect, Mosquitto_Client_callback_args, ZEND_ACC_PUBLIC)
PHP_ME(Mosquitto_Client, onLog, Mosquitto_Client_callback_args, ZEND_ACC_PUBLIC)
Expand Down