diff options
| author | me_desk <me_desk@fb96df88-216d-11de-830c-f3023f12d8ac> | 2015-01-30 19:53:56 +0000 |
|---|---|---|
| committer | Anton <anton@picapica> | 2015-03-10 03:42:49 +0400 |
| commit | 74419352eeeb2e7b8717978f782d20ff788c0e56 (patch) | |
| tree | 1ff883d6569a6b994449525bf73d73eb287302fb | |
| parent | 04e991d8146aeff27b2d793b3f6a3c7c1f20913e (diff) | |
| download | pica-pica-74419352eeeb2e7b8717978f782d20ff788c0e56.tar.gz pica-pica-74419352eeeb2e7b8717978f782d20ff788c0e56.zip | |
added new protocol messages definitions, updated protocol version
git-svn-id: svn://localhost/project_picapica/trunk@339 fb96df88-216d-11de-830c-f3023f12d8ac
| -rwxr-xr-x | PICA_client.c | 4 | ||||
| -rwxr-xr-x | PICA_proto.h | 15 |
2 files changed, 16 insertions, 3 deletions
diff --git a/PICA_client.c b/PICA_client.c index 50751d4..da192ee 100755 --- a/PICA_client.c +++ b/PICA_client.c @@ -65,8 +65,8 @@ const struct PICA_msginfo c2c_messages[] = { {PICA_PROTO_SENDFILEREQUEST, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_SENDFILEREQUEST}, {PICA_PROTO_ACCEPTEDFILE, PICA_MSG_FIXED_SIZE, PICA_PROTO_ACCEPTEDFILE_SIZE, procmsg_ACCEPTEDFILE}, {PICA_PROTO_DENIEDFILE, PICA_MSG_FIXED_SIZE, PICA_PROTO_DENIEDFILE_SIZE, procmsg_DENIEDFILE}, - {PICA_PROTO_FILEFRAGMENT, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_FILEFRAGMENT}, - {PICA_PROTO_FILECONTROL, PICA_MSG_FIXED_SIZE, PICA_PROTO_FILECONTROL_SIZE, procmsg_FILECONTROL} + {PICA_PROTO_FILEFRAGMENT, PICA_MSG_VAR_SIZE, PICA_MSG_VARSIZE_INT16, procmsg_FILEFRAGMENT}, + {PICA_PROTO_FILECONTROL, PICA_MSG_FIXED_SIZE, PICA_PROTO_FILECONTROL_SIZE, procmsg_FILECONTROL} }; struct PICA_msginfo c2n_init_messages[] = { diff --git a/PICA_proto.h b/PICA_proto.h index cb20db5..71450e8 100755 --- a/PICA_proto.h +++ b/PICA_proto.h @@ -5,7 +5,10 @@ #define PICA_PROTO_VER_HIGH 0 -#define PICA_PROTO_VER_LOW 4 +#define PICA_PROTO_VER_LOW 5 + +#define PICA_C2CPROTO_VER_HIGH 0 +#define PICA_C2CPROTO_VER_LOW 1 #define PICA_PROTO_VER_STRING PICA_STRINGIFY2(PICA_PROTO_VER_HIGH, PICA_PROTO_VER_LOW) #define PICA_STRINGIFY2(H, L) PICA_STRINGIFY(H, L) @@ -26,6 +29,12 @@ #define PICA_PROTO_CONNID 0x20 +#define PICA_PROTO_C2CCONNREQ 0xCC + +#define PICA_PROTO_C2CDIRECT_IPV4 0xA0 +#define PICA_PROTO_C2CDIRECT_IPV6 0xA1 +#define PICA_PROTO_C2CDIRECT_DNS 0xA2 + #define PICA_PROTO_MSGUTF8 0x30 #define PICA_PROTO_MSGOK 0x40 #define PICA_PROTO_SENDFILEREQUEST 0x50 @@ -76,6 +85,10 @@ #define PICA_PROTO_CONNID_SIZE 58 +#define PICA_PROTO_C2CCONNREQ_SIZE 4 +#define PICA_PROTO_C2CDIRECT_IPV4_SIZE 8 +#define PICA_PROTO_C2CDIRECT_IPV6_SIZE 20 + #define PICA_PROTO_MSGOK_SIZE 4 #define PICA_PROTO_ACCEPTEDFILE_SIZE 4 |