Skip to content

Commit 069b517

Browse files
NamsooChoNamsooCho
committed
fix(conference): change *number to *id
1 parent 74ff046 commit 069b517

File tree

23 files changed

+331
-322
lines changed

23 files changed

+331
-322
lines changed

‎src/toxcore/messenger/conference/packet/action.rs‎

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -15,35 +15,38 @@ Serialized form:
1515
Length | Content
1616
--------- | ------
1717
`1` | `0x63`
18-
`2` | `conference number`
19-
`2` | `peer number`
20-
`4` | `action number`
18+
`2` | `conference id`
19+
`2` | `peer id`
20+
`4` | `action id`
2121
`1` | `0x41`
2222
variable | `action`(UTF-8 C String)
2323
2424
*/
2525
#[derive(Clone, Debug, Eq, PartialEq)]
2626
pub struct Action {
27-
conference_number: u16,
28-
peer_number: u16,
29-
message_number: u32,
27+
/// Id of conference
28+
pub conference_id: u16,
29+
/// Target peer id
30+
pub peer_id: u16,
31+
/// Id of this message
32+
pub message_id: u32,
3033
/// Maximum length of action is the limit of NetCrypto packet.
3134
/// Do not check the length here.
32-
action: String,
35+
pub action: String,
3336
}
3437

3538
impl FromBytes for Action {
3639
named!(from_bytes<Action>, do_parse!(
3740
tag!("\x63") >>
38-
conference_number: be_u16 >>
39-
peer_number: be_u16 >>
40-
message_number: be_u32 >>
41+
conference_id: be_u16 >>
42+
peer_id: be_u16 >>
43+
message_id: be_u32 >>
4144
tag!("\x41") >>
4245
action: map_res!(rest, str::from_utf8) >>
4346
(Action {
44-
conference_number,
45-
peer_number,
46-
message_number,
47+
conference_id,
48+
peer_id,
49+
message_id,
4750
action: action.to_string(),
4851
})
4952
));
@@ -53,9 +56,9 @@ impl ToBytes for Action {
5356
fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
5457
do_gen!(buf,
5558
gen_be_u8!(0x63) >>
56-
gen_be_u16!(self.conference_number) >>
57-
gen_be_u16!(self.peer_number) >>
58-
gen_be_u32!(self.message_number) >>
59+
gen_be_u16!(self.conference_id) >>
60+
gen_be_u16!(self.peer_id) >>
61+
gen_be_u32!(self.message_id) >>
5962
gen_be_u8!(0x41) >>
6063
gen_slice!(self.action.as_bytes())
6164
)
@@ -64,11 +67,11 @@ impl ToBytes for Action {
6467

6568
impl Action {
6669
/// Create new Action object.
67-
pub fn new(conference_number: u16, peer_number: u16, message_number: u32, action: String) -> Self {
70+
pub fn new(conference_id: u16, peer_id: u16, message_id: u32, action: String) -> Self {
6871
Action {
69-
conference_number,
70-
peer_number,
71-
message_number,
72+
conference_id,
73+
peer_id,
74+
message_id,
7275
action,
7376
}
7477
}

‎src/toxcore/messenger/conference/packet/change_name.rs‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,38 @@ Serialized form:
1616
Length | Content
1717
--------- | ------
1818
`1` | `0x63`
19-
`2` | `conference number`
20-
`2` | `peer number`
21-
`4` | `message number`
19+
`2` | `conference id`
20+
`2` | `peer id`
21+
`4` | `message id`
2222
`1` | `0x30`
2323
variable | `name`(UTF-8 C String)
2424
2525
*/
2626
#[derive(Clone, Debug, Eq, PartialEq)]
2727
pub struct ChangeName {
28-
conference_number: u16,
29-
peer_number: u16,
30-
message_number: u32,
31-
name: String,
28+
/// Id of conference
29+
pub conference_id: u16,
30+
/// Target peer id
31+
pub peer_id: u16,
32+
/// Id of this message
33+
pub message_id: u32,
34+
/// Name to change
35+
pub name: String,
3236
}
3337

3438
impl FromBytes for ChangeName {
3539
named!(from_bytes<ChangeName>, do_parse!(
3640
tag!("\x63") >>
37-
conference_number: be_u16 >>
38-
peer_number: be_u16 >>
39-
message_number: be_u32 >>
41+
conference_id: be_u16 >>
42+
peer_id: be_u16 >>
43+
message_id: be_u32 >>
4044
tag!("\x30") >>
4145
name: map_res!(verify!(rest, |name: &[u8]| name.len() <= MAX_NAME_LENGTH_IN_CONFERENCE),
4246
str::from_utf8) >>
4347
(ChangeName {
44-
conference_number,
45-
peer_number,
46-
message_number,
48+
conference_id,
49+
peer_id,
50+
message_id,
4751
name: name.to_string(),
4852
})
4953
));
@@ -53,9 +57,9 @@ impl ToBytes for ChangeName {
5357
fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
5458
do_gen!(buf,
5559
gen_be_u8!(0x63) >>
56-
gen_be_u16!(self.conference_number) >>
57-
gen_be_u16!(self.peer_number) >>
58-
gen_be_u32!(self.message_number) >>
60+
gen_be_u16!(self.conference_id) >>
61+
gen_be_u16!(self.peer_id) >>
62+
gen_be_u32!(self.message_id) >>
5963
gen_be_u8!(0x30) >>
6064
gen_cond!(self.name.len() > MAX_NAME_LENGTH_IN_CONFERENCE, |buf| gen_error(buf, 0)) >>
6165
gen_slice!(self.name.as_bytes())
@@ -65,11 +69,11 @@ impl ToBytes for ChangeName {
6569

6670
impl ChangeName {
6771
/// Create new ChangeName object.
68-
pub fn new(conference_number: u16, peer_number: u16, message_number: u32, name: String) -> Self {
72+
pub fn new(conference_id: u16, peer_id: u16, message_id: u32, name: String) -> Self {
6973
ChangeName {
70-
conference_number,
71-
peer_number,
72-
message_number,
74+
conference_id,
75+
peer_id,
76+
message_id,
7377
name,
7478
}
7579
}
@@ -104,7 +108,7 @@ mod tests {
104108
fn change_name_to_bytes_overflow() {
105109
let large_string = String::from_utf8(vec![32u8; MAX_NAME_LENGTH_IN_CONFERENCE + 1]).unwrap();
106110
let large_name = ChangeName::new(1,2, 3, large_string);
107-
let mut buf = [0; MAX_NAME_LENGTH_IN_CONFERENCE + 1 + 2 + 2 + 4 + 1]; // packet id + conference number + peer number + message number + message kind.
111+
let mut buf = [0; MAX_NAME_LENGTH_IN_CONFERENCE + 1 + 2 + 2 + 4 + 1]; // packet id + conference id + peer id + message id + message kind.
108112
assert!(large_name.to_bytes((&mut buf, 0)).is_err());
109113
}
110114
}

‎src/toxcore/messenger/conference/packet/change_title.rs‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -17,34 +17,38 @@ Serialized form:
1717
Length | Content
1818
--------- | ------
1919
`1` | `0x63`
20-
`2` | `conference number`
21-
`2` | `peer number`
22-
`4` | `message number`
20+
`2` | `conference id`
21+
`2` | `peer id`
22+
`4` | `message id`
2323
`1` | `0x31`
2424
variable | `title`(UTF-8 C String)
2525
2626
*/
2727
#[derive(Clone, Debug, Eq, PartialEq)]
2828
pub struct ChangeTitle {
29-
conference_number: u16,
30-
peer_number: u16,
31-
message_number: u32,
32-
title: String,
29+
/// Id of conference
30+
pub conference_id: u16,
31+
/// Target peer id
32+
pub peer_id: u16,
33+
/// Id of this message
34+
pub message_id: u32,
35+
/// Title to change
36+
pub title: String,
3337
}
3438

3539
impl FromBytes for ChangeTitle {
3640
named!(from_bytes<ChangeTitle>, do_parse!(
3741
tag!("\x63") >>
38-
conference_number: be_u16 >>
39-
peer_number: be_u16 >>
40-
message_number: be_u32 >>
42+
conference_id: be_u16 >>
43+
peer_id: be_u16 >>
44+
message_id: be_u32 >>
4145
tag!("\x31") >>
4246
title: map_res!(verify!(rest, |title: &[u8]| title.len() <= MAX_NAME_LENGTH_IN_CONFERENCE),
4347
str::from_utf8) >>
4448
(ChangeTitle {
45-
conference_number,
46-
peer_number,
47-
message_number,
49+
conference_id,
50+
peer_id,
51+
message_id,
4852
title: title.to_string(),
4953
})
5054
));
@@ -54,9 +58,9 @@ impl ToBytes for ChangeTitle {
5458
fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
5559
do_gen!(buf,
5660
gen_be_u8!(0x63) >>
57-
gen_be_u16!(self.conference_number) >>
58-
gen_be_u16!(self.peer_number) >>
59-
gen_be_u32!(self.message_number) >>
61+
gen_be_u16!(self.conference_id) >>
62+
gen_be_u16!(self.peer_id) >>
63+
gen_be_u32!(self.message_id) >>
6064
gen_be_u8!(0x31) >>
6165
gen_cond!(self.title.len() > MAX_NAME_LENGTH_IN_CONFERENCE, |buf| gen_error(buf, 0)) >>
6266
gen_slice!(self.title.as_bytes())
@@ -66,11 +70,11 @@ impl ToBytes for ChangeTitle {
6670

6771
impl ChangeTitle {
6872
/// Create new ChangeTitle object.
69-
pub fn new(conference_number: u16, peer_number: u16, message_number: u32, title: String) -> Self {
73+
pub fn new(conference_id: u16, peer_id: u16, message_id: u32, title: String) -> Self {
7074
ChangeTitle {
71-
conference_number,
72-
peer_number,
73-
message_number,
75+
conference_id,
76+
peer_id,
77+
message_id,
7478
title,
7579
}
7680
}
@@ -105,7 +109,7 @@ mod tests {
105109
fn change_title_to_bytes_overflow() {
106110
let large_string = String::from_utf8(vec![32u8; MAX_NAME_LENGTH_IN_CONFERENCE + 1]).unwrap();
107111
let large_title = ChangeTitle::new(1,2, 3, large_string);
108-
let mut buf = [0; MAX_NAME_LENGTH_IN_CONFERENCE + 1 + 2 + 2 + 4 + 1]; // packet id + conference number + peer number + message number + message kind.
112+
let mut buf = [0; MAX_NAME_LENGTH_IN_CONFERENCE + 1 + 2 + 2 + 4 + 1]; // packet id + conference id + peer id + message id + message kind.
109113
assert!(large_title.to_bytes((&mut buf, 0)).is_err());
110114
}
111115
}

‎src/toxcore/messenger/conference/packet/freeze_peer.rs‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,38 @@ Serialized form:
1414
Length | Content
1515
--------- | ------
1616
`1` | `0x63`
17-
`2` | `conference number`
18-
`2` | `peer number`
19-
`4` | `message number`
17+
`2` | `conference id`
18+
`2` | `peer id`
19+
`4` | `message id`
2020
`1` | `0x12`
21-
`2` | `peer number`
21+
`2` | `peer id`
2222
2323
*/
2424
#[derive(Clone, Debug, Eq, PartialEq)]
2525
pub struct FreezePeer {
26-
conference_number: u16,
27-
peer_number: u16,
28-
message_number: u32,
29-
freeze_peer_number: u16,
26+
/// Id of conference
27+
pub conference_id: u16,
28+
/// Target peer id
29+
pub peer_id: u16,
30+
/// Id of this message
31+
pub message_id: u32,
32+
/// Peer id freezed
33+
pub freeze_peer_id: u16,
3034
}
3135

3236
impl FromBytes for FreezePeer {
3337
named!(from_bytes<FreezePeer>, do_parse!(
3438
tag!("\x63") >>
35-
conference_number: be_u16 >>
36-
peer_number: be_u16 >>
37-
message_number: be_u32 >>
39+
conference_id: be_u16 >>
40+
peer_id: be_u16 >>
41+
message_id: be_u32 >>
3842
tag!("\x12") >>
39-
freeze_peer_number: be_u16 >>
43+
freeze_peer_id: be_u16 >>
4044
(FreezePeer {
41-
conference_number,
42-
peer_number,
43-
message_number,
44-
freeze_peer_number,
45+
conference_id,
46+
peer_id,
47+
message_id,
48+
freeze_peer_id,
4549
})
4650
));
4751
}
@@ -50,23 +54,23 @@ impl ToBytes for FreezePeer {
5054
fn to_bytes<'a>(&self, buf: (&'a mut [u8], usize)) -> Result<(&'a mut [u8], usize), GenError> {
5155
do_gen!(buf,
5256
gen_be_u8!(0x63) >>
53-
gen_be_u16!(self.conference_number) >>
54-
gen_be_u16!(self.peer_number) >>
55-
gen_be_u32!(self.message_number) >>
57+
gen_be_u16!(self.conference_id) >>
58+
gen_be_u16!(self.peer_id) >>
59+
gen_be_u32!(self.message_id) >>
5660
gen_be_u8!(0x12) >>
57-
gen_be_u16!(self.freeze_peer_number)
61+
gen_be_u16!(self.freeze_peer_id)
5862
)
5963
}
6064
}
6165

6266
impl FreezePeer {
6367
/// Create new FreezePeer object.
64-
pub fn new(conference_number: u16, peer_number: u16, message_number: u32, freeze_peer_number: u16) -> Self {
68+
pub fn new(conference_id: u16, peer_id: u16, message_id: u32, freeze_peer_id: u16) -> Self {
6569
FreezePeer {
66-
conference_number,
67-
peer_number,
68-
message_number,
69-
freeze_peer_number,
70+
conference_id,
71+
peer_id,
72+
message_id,
73+
freeze_peer_id,
7074
}
7175
}
7276
}

0 commit comments

Comments
 (0)