summaryrefslogtreecommitdiff
path: root/wrapper
diff options
context:
space:
mode:
authorLuo Jinghua <sunmoon1997@gmail.com>2009-08-25 21:17:33 +0800
committerLuo Jinghua <sunmoon1997@gmail.com>2009-08-25 21:17:33 +0800
commit0f21921897fedb1fd34cc9435c56941daa7adfe7 (patch)
tree9c1435fd7c01f91a6a816bd1c1da10d1407bec49 /wrapper
parent9de161e05a75a964c4684c9a8aa33378bf3a19ec (diff)
wrapper: increate message length to 0xffffff
Diffstat (limited to 'wrapper')
-rw-r--r--wrapper/ppswrapper.c2
-rw-r--r--wrapper/ppswrapper.h13
2 files changed, 8 insertions, 7 deletions
diff --git a/wrapper/ppswrapper.c b/wrapper/ppswrapper.c
index 2d7299c..f66770a 100644
--- a/wrapper/ppswrapper.c
+++ b/wrapper/ppswrapper.c
@@ -103,7 +103,7 @@ int ppsvod_destroy(void)
return -1;
if (!ppsw_state.created)
- return;
+ return -1;
PPSW_SYNC(ret = ppsw_client_send_destroy(ppsw_state.client));
diff --git a/wrapper/ppswrapper.h b/wrapper/ppswrapper.h
index 686da42..89113b9 100644
--- a/wrapper/ppswrapper.h
+++ b/wrapper/ppswrapper.h
@@ -69,13 +69,13 @@ typedef struct {
/*** sequence number */
uint16_t seq;
/*** payload length */
- uint16_t len;
+ uint32_t len;
} ppsw_msg_t;
-#define PPSW_MSG_HEADER_LEN (2 * 3 + 1)
+#define PPSW_MSG_HEADER_LEN (2 * 2 + 4 + 1)
typedef struct {
- uint16_t len;
+ uint32_t len;
uint16_t offset;
uint8_t *data;
@@ -152,6 +152,7 @@ typedef struct {
char expire_time[1024];
ppscategory* categories;
+ ppschannel* channel;
pthread_mutex_t mutex;
@@ -216,8 +217,8 @@ ppsw_client_send_create(ppsw_t *self,
const char *device_id,
pps_callback pcallback);
-void
-ppsw_cliend_send_destroy(ppsw_t* self);
+int
+ppsw_client_send_destroy(ppsw_t* self);
int ppsw_client_send_close(ppsw_t* super);
@@ -346,7 +347,7 @@ ppsw_packet_write_str(ppsw_packet_t* self,
int
ppsw_packet_init(ppsw_packet_t* p,
uint16_t id,
- uint16_t len);
+ uint32_t len);
void
ppsw_packet_fini(ppsw_packet_t* p);