vitalif
/
pecl-tools-stomp
mirror of https://github.com/vitalif/pecl-tools-stomp
1
0
Fork 0
Code Issues Releases Wiki Activity

Move the use_ssl bool into the option struct

v1.1
Pierrick Charron 2009-12-28 01:05:04 +00:00
parent 7c135b9664
commit 8a19087270
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
php_stomp.c
View File

@ -456,7 +456,7 @@ PHP_FUNCTION(stomp_connect)
stomp = stomp_init();
#if HAVE_STOMP_SSL
stomp->use_ssl = use_ssl;
stomp->options.use_ssl = use_ssl;
#endif
stomp->options.read_timeout_sec = STOMP_G(read_timeout_sec);

8
stomp.c
View File

@ -54,8 +54,8 @@ stomp_t *stomp_init()
stomp->options.read_timeout_usec = 2;
#if HAVE_STOMP_SSL
stomp->options.use_ssl = 0;
stomp->ssl_handle = NULL;
stomp->use_ssl = 0;
#endif
return stomp;
@ -121,7 +121,7 @@ int stomp_connect(stomp_t *stomp, const char *host, unsigned short port TSRMLS_D
if (select(stomp->fd + 1, NULL, &rfds, NULL, &tv) > 0) {
#if HAVE_STOMP_SSL
if (stomp->use_ssl) {
if (stomp->options.use_ssl) {
SSL_CTX *ctx = SSL_CTX_new(SSLv23_client_method());
if (NULL == ctx) {
stomp_set_error(stomp, "failed to create the SSL context", 0);
@ -231,7 +231,7 @@ int stomp_send(stomp_t *stomp, stomp_frame_t *frame TSRMLS_DC)
}
#ifdef HAVE_STOMP_SSL
if (stomp->use_ssl) {
if (stomp->options.use_ssl) {
if (-1 == SSL_write(stomp->ssl_handle, buf.c, buf.len) || -1 == SSL_write(stomp->ssl_handle, "\0\n", 2)) {
char error[1024];
snprintf(error, sizeof(error), "Unable to send data");
@ -262,7 +262,7 @@ int stomp_recv(stomp_t *stomp, char *msg, size_t length)
{
int len;
#if HAVE_STOMP_SSL
if(stomp->use_ssl) {
if(stomp->options.use_ssl) {
len = SSL_read(stomp->ssl_handle, msg, length);
} else {
#endif

4
stomp.h
View File

@ -40,6 +40,9 @@ typedef struct _stomp_options {
long connect_timeout_usec;
long read_timeout_sec;
long read_timeout_usec;
#if HAVE_STOMP_SSL
int use_ssl;
#endif
} stomp_options_t;
typedef struct _stomp {
@ -54,7 +57,6 @@ typedef struct _stomp {
char *session;
#if HAVE_STOMP_SSL
SSL *ssl_handle;
int use_ssl;
#endif
} stomp_t;