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

Rename few things

v1.1
Pierrick Charron 2012-11-20 19:12:26 -05:00
parent 36c7391402
commit 9e0839fff1
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
stomp.c
View File

@ -59,36 +59,36 @@ stomp_t *stomp_init()
stomp->ssl_handle = NULL; stomp->ssl_handle = NULL;
#endif #endif
stomp->buffer = NULL; stomp->frame_stack = NULL;
return stomp; return stomp;
} }
/* }}} */ /* }}} */
/* {{{ stomp_frame_buffer_push /* {{{ stomp_frame_stack_push
*/ */
void stomp_frame_buffer_push(stomp_frame_cell_t **pcell, stomp_frame_t *frame) void stomp_frame_stack_push(stomp_frame_stack_t **stack, stomp_frame_t *frame)
{ {
stomp_frame_cell_t *cell = (stomp_frame_cell_t *) emalloc(sizeof(stomp_frame_cell_t)); stomp_frame_stack_t *cell = (stomp_frame_stack_t *) emalloc(sizeof(stomp_frame_stack_t));
cell->frame = frame; cell->frame = frame;
cell->next = NULL; cell->next = NULL;
if (!*pcell) { if (!*stack) {
*pcell = cell; *stack = cell;
} else { } else {
stomp_frame_cell_t *cursor = *pcell; stomp_frame_stack_t *cursor = *stack;
while (cursor->next != NULL) cursor = cursor->next; while (cursor->next != NULL) cursor = cursor->next;
cursor->next = cell; cursor->next = cell;
} }
} }
/* }}} */ /* }}} */
/* {{{ stomp_frame_buffer_shift /* {{{ stomp_frame_stack_shift
*/ */
stomp_frame_t *stomp_frame_buffer_shift(stomp_frame_cell_t **pcell) { stomp_frame_t *stomp_frame_stack_shift(stomp_frame_stack_t **stack) {
stomp_frame_t *frame = NULL; stomp_frame_t *frame = NULL;
if (*pcell) { if (*stack) {
stomp_frame_cell_t *cell = *pcell; stomp_frame_stack_t *cell = *stack;
*pcell = cell->next; *stack = cell->next;
frame = cell->frame; frame = cell->frame;
efree(cell); efree(cell);
} }
@ -96,11 +96,11 @@ stomp_frame_t *stomp_frame_buffer_shift(stomp_frame_cell_t **pcell) {
} }
/* }}} */ /* }}} */
/* {{{ stomp_frame_buffer_clear /* {{{ stomp_frame_stack_clear
*/ */
void stomp_frame_buffer_clear(stomp_frame_cell_t **pcell) { void stomp_frame_stack_clear(stomp_frame_stack_t **stack) {
stomp_frame_t *frame = NULL; stomp_frame_t *frame = NULL;
while (frame = stomp_frame_buffer_shift(pcell)) efree(frame); while (frame = stomp_frame_stack_shift(stack)) efree(frame);
} }
/* }}} */ /* }}} */
@ -246,7 +246,7 @@ void stomp_close(stomp_t *stomp)
if (stomp->error_details) { if (stomp->error_details) {
efree(stomp->error_details); efree(stomp->error_details);
} }
stomp_frame_buffer_clear(&stomp->buffer); stomp_frame_stack_clear(&stomp->frame_stack);
efree(stomp); efree(stomp);
} }
/* }}} */ /* }}} */
@ -496,8 +496,8 @@ stomp_frame_t *stomp_read_frame(stomp_t *stomp)
char *cmd = NULL, *length_str = NULL; char *cmd = NULL, *length_str = NULL;
int length = 0; int length = 0;
if (stomp->buffer) { if (stomp->frame_stack) {
return stomp_frame_buffer_shift(&stomp->buffer); return stomp_frame_stack_shift(&stomp->frame_stack);
} }
if (!stomp_select(stomp)) { if (!stomp_select(stomp)) {
@ -593,7 +593,7 @@ int stomp_valid_receipt(stomp_t *stomp, stomp_frame_t *frame) {
char *receipt = NULL; char *receipt = NULL;
if (zend_hash_find(frame->headers, "receipt", sizeof("receipt"), (void **)&receipt) == SUCCESS) { if (zend_hash_find(frame->headers, "receipt", sizeof("receipt"), (void **)&receipt) == SUCCESS) {
stomp_frame_cell_t *buffer = NULL; stomp_frame_stack_t *stack = NULL;
success = 0; success = 0;
while (1) { while (1) {
stomp_frame_t *res = stomp_read_frame(stomp); stomp_frame_t *res = stomp_read_frame(stomp);
@ -609,7 +609,7 @@ int stomp_valid_receipt(stomp_t *stomp, stomp_frame_t *frame) {
stomp_set_error(stomp, error, 0, NULL); stomp_set_error(stomp, error, 0, NULL);
} }
stomp_free_frame(res); stomp_free_frame(res);
stomp->buffer = buffer; stomp->frame_stack = stack;
return success; return success;
} else if (0 == strncmp("ERROR", res->command, sizeof("ERROR") - 1)) { } else if (0 == strncmp("ERROR", res->command, sizeof("ERROR") - 1)) {
char *error_msg = NULL; char *error_msg = NULL;
@ -617,13 +617,13 @@ int stomp_valid_receipt(stomp_t *stomp, stomp_frame_t *frame) {
stomp_set_error(stomp, error_msg, 0, res->body); stomp_set_error(stomp, error_msg, 0, res->body);
} }
stomp_free_frame(res); stomp_free_frame(res);
stomp->buffer = buffer; stomp->frame_stack = stack;
return success; return success;
} else { } else {
stomp_frame_buffer_push(&buffer, res); stomp_frame_stack_push(&stack, res);
} }
} else { } else {
stomp->buffer = buffer; stomp->frame_stack = stack;
return success; return success;
} }
} }
@ -639,7 +639,7 @@ int stomp_select_ex(stomp_t *stomp, const long int sec, const long int usec)
int n; int n;
struct timeval tv; struct timeval tv;
if (stomp->buffer) { if (stomp->frame_stack) {
return 1; return 1;
} }
tv.tv_sec = sec; tv.tv_sec = sec;

8
stomp.h
View File

@ -53,10 +53,10 @@ typedef struct _stomp_frame {
int body_length; int body_length;
} stomp_frame_t; } stomp_frame_t;
typedef struct _stomp_frame_cell { typedef struct _stomp_frame_stack {
stomp_frame_t *frame; stomp_frame_t *frame;
struct _stomp_frame_cell *next; struct _stomp_frame_stack *next;
} stomp_frame_cell_t; } stomp_frame_stack_t;
typedef struct _stomp { typedef struct _stomp {
php_socket_t fd; php_socket_t fd;
@ -72,7 +72,7 @@ typedef struct _stomp {
#if HAVE_STOMP_SSL #if HAVE_STOMP_SSL
SSL *ssl_handle; SSL *ssl_handle;
#endif #endif
stomp_frame_cell_t *buffer; stomp_frame_stack_t *frame_stack;
} stomp_t; } stomp_t;
stomp_t *stomp_init(); stomp_t *stomp_init();