More protocol changes for rejoin. Re-adding server password to protocol.

This commit is contained in:
lotodore
2011-10-03 08:03:58 +00:00
parent f8c89304d1
commit aee0adbffe
123 changed files with 766 additions and 535 deletions
+11 -53
View File
@@ -7,38 +7,6 @@
#include "JoinGameRequestMessage.h"
static int
memb_password_constraint_1(asn_TYPE_descriptor_t *td, const void *sptr,
asn_app_constraint_failed_f *ctfailcb, void *app_key) {
const UTF8String_t *st = (const UTF8String_t *)sptr;
size_t size;
if(!sptr) {
_ASN_CTFAIL(app_key, td, sptr,
"%s: value not given (%s:%d)",
td->name, __FILE__, __LINE__);
return -1;
}
size = UTF8String_length(st);
if((ssize_t)size < 0) {
_ASN_CTFAIL(app_key, td, sptr,
"%s: UTF-8: broken encoding (%s:%d)",
td->name, __FILE__, __LINE__);
return -1;
}
if((size >= 1 && size <= 64)) {
/* Constraint check succeeded */
return 0;
} else {
_ASN_CTFAIL(app_key, td, sptr,
"%s: constraint failed (%s:%d)",
td->name, __FILE__, __LINE__);
return -1;
}
}
static asn_TYPE_member_t asn_MBR_joinGameAction_2[] = {
{ ATF_NOFLAGS, 0, offsetof(struct joinGameAction, choice.joinExistingGame),
(ASN_TAG_CLASS_CONTEXT | (0 << 2)),
@@ -69,9 +37,9 @@ static asn_TYPE_member_t asn_MBR_joinGameAction_2[] = {
},
};
static asn_TYPE_tag2member_t asn_MAP_joinGameAction_tag2el_2[] = {
{ (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* joinExistingGame at 282 */
{ (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* joinNewGame at 283 */
{ (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* rejoinExistingGame at 285 */
{ (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* joinExistingGame at 284 */
{ (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 1, 0, 0 }, /* joinNewGame at 285 */
{ (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 2, 0, 0 } /* rejoinExistingGame at 287 */
};
static asn_CHOICE_specifics_t asn_SPC_joinGameAction_specs_2 = {
sizeof(struct joinGameAction),
@@ -116,15 +84,6 @@ static asn_TYPE_member_t asn_MBR_JoinGameRequestMessage_1[] = {
0,
"joinGameAction"
},
{ ATF_POINTER, 1, offsetof(struct JoinGameRequestMessage, password),
(ASN_TAG_CLASS_UNIVERSAL | (12 << 2)),
0,
&asn_DEF_UTF8String,
memb_password_constraint_1,
0, /* PER is not compiled, use -gen-PER */
0,
"password"
},
{ ATF_NOFLAGS, 0, offsetof(struct JoinGameRequestMessage, autoLeave),
(ASN_TAG_CLASS_UNIVERSAL | (1 << 2)),
0,
@@ -140,20 +99,19 @@ static ber_tlv_tag_t asn_DEF_JoinGameRequestMessage_tags_1[] = {
(ASN_TAG_CLASS_UNIVERSAL | (16 << 2))
};
static asn_TYPE_tag2member_t asn_MAP_JoinGameRequestMessage_tag2el_1[] = {
{ (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 2, 0, 0 }, /* autoLeave at 287 */
{ (ASN_TAG_CLASS_UNIVERSAL | (12 << 2)), 1, 0, 0 }, /* password at 286 */
{ (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* joinExistingGame at 282 */
{ (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* joinNewGame at 283 */
{ (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 0, 0, 0 } /* rejoinExistingGame at 285 */
{ (ASN_TAG_CLASS_UNIVERSAL | (1 << 2)), 1, 0, 0 }, /* autoLeave at 288 */
{ (ASN_TAG_CLASS_CONTEXT | (0 << 2)), 0, 0, 0 }, /* joinExistingGame at 284 */
{ (ASN_TAG_CLASS_CONTEXT | (1 << 2)), 0, 0, 0 }, /* joinNewGame at 285 */
{ (ASN_TAG_CLASS_CONTEXT | (2 << 2)), 0, 0, 0 } /* rejoinExistingGame at 287 */
};
static asn_SEQUENCE_specifics_t asn_SPC_JoinGameRequestMessage_specs_1 = {
sizeof(struct JoinGameRequestMessage),
offsetof(struct JoinGameRequestMessage, _asn_ctx),
asn_MAP_JoinGameRequestMessage_tag2el_1,
5, /* Count of tags in the map */
4, /* Count of tags in the map */
0, 0, 0, /* Optional elements (not needed) */
2, /* Start extensions */
4 /* Stop extensions */
1, /* Start extensions */
3 /* Stop extensions */
};
asn_TYPE_descriptor_t asn_DEF_JoinGameRequestMessage = {
"JoinGameRequestMessage",
@@ -175,7 +133,7 @@ asn_TYPE_descriptor_t asn_DEF_JoinGameRequestMessage = {
/sizeof(asn_DEF_JoinGameRequestMessage_tags_1[0]), /* 2 */
0, /* No PER visible constraints */
asn_MBR_JoinGameRequestMessage_1,
3, /* Elements count */
2, /* Elements count */
&asn_SPC_JoinGameRequestMessage_specs_1 /* Additional specs */
};