commit b3023d6d5af96229413c428502ebdfec84289743 parent 501725f624a93314edd1e7c2fc2dcc325a75c8f7 Author: kyle <kyle@0x30.net> Date: Sat, 2 Jan 2016 16:45:01 -0700 sl: rename most messages - convert to <noun>_<verb> style naming - change new_device to device_add - change {leave,join,new}_list to list_{leave,join,add} - change list_get{,_other} to lists_get{,_other} - change ok to device_ok - change add_friend to friend_add Diffstat:
35 files changed, 356 insertions(+), 356 deletions(-)
diff --git a/gen_msgs.sh b/gen_msgs.sh @@ -2,16 +2,16 @@ protocol_version=0 msg_types=" - new_device - add_friend - new_list - join_list - leave_list - list_get - list_get_other - list_items - new_list_item - ok + device_add + device_ok + friend_add + list_add + list_join + list_leave + lists_get + lists_get_other + list_items_get + list_item_add " objc_path="ios/shlist/MsgTypes.h" diff --git a/server/msgs.pl b/server/msgs.pl @@ -1,42 +1,42 @@ #!/usr/bin/perl -# generated Mon Dec 28 00:59:49 MST 2015 +# generated 'Sat Jan 2 16:41:19 MST 2016' use strict; use warnings; our $protocol_ver = 0; our %msg_num = ( - new_device => 0, - add_friend => 1, - new_list => 2, - join_list => 3, - leave_list => 4, - list_get => 5, - list_get_other => 6, - list_items => 7, - new_list_item => 8, - ok => 9, + device_add => 0, + device_ok => 1, + friend_add => 2, + list_add => 3, + list_join => 4, + list_leave => 5, + lists_get => 6, + lists_get_other => 7, + list_items_get => 8, + list_item_add => 9, ); our @msg_str = ( - 'new_device', - 'add_friend', - 'new_list', - 'join_list', - 'leave_list', - 'list_get', - 'list_get_other', - 'list_items', - 'new_list_item', - 'ok', + 'device_add', + 'device_ok', + 'friend_add', + 'list_add', + 'list_join', + 'list_leave', + 'lists_get', + 'lists_get_other', + 'list_items_get', + 'list_item_add', ); our @msg_func = ( - \&msg_new_device, - \&msg_add_friend, - \&msg_new_list, - \&msg_join_list, - \&msg_leave_list, - \&msg_list_get, - \&msg_list_get_other, - \&msg_list_items, - \&msg_new_list_item, - \&msg_ok, + \&msg_device_add, + \&msg_device_ok, + \&msg_friend_add, + \&msg_list_add, + \&msg_list_join, + \&msg_list_leave, + \&msg_lists_get, + \&msg_lists_get_other, + \&msg_list_items_get, + \&msg_list_item_add, ); diff --git a/server/sl b/server/sl @@ -178,7 +178,7 @@ sub send_all { return; } -sub msg_new_device { +sub msg_device_add { my ($sth, $msg) = @_; my ($err, $ph_num, $os) = split_fields($msg, 2); @@ -211,7 +211,7 @@ sub msg_new_device { return "ok\0$token"; } -sub msg_new_list { +sub msg_list_add { my ($sth, $msg) = @_; my ($err, $device_id, $list_name) = split_fields($msg, 2); @@ -239,7 +239,7 @@ sub msg_new_list { return "ok\0$response"; } -sub msg_new_list_item { +sub msg_list_item_add { my ($sth, $msg) = @_; my ($err, $device_id) = split_fields($msg, 1); @@ -264,7 +264,7 @@ sub msg_new_list_item { # last_update } -sub msg_join_list { +sub msg_list_join { my ($sth, $msg) = @_; my ($err, $device_id, $list_id) = split_fields($msg, 2); @@ -293,7 +293,7 @@ sub msg_join_list { return "ok\0$list_id"; } -sub msg_leave_list { +sub msg_list_leave { my ($sth, $msg) = @_; my ($err, $device_id, $list_id) = split_fields($msg, 2); @@ -333,7 +333,7 @@ sub msg_leave_list { return "ok\0$out"; } -sub msg_add_friend { +sub msg_friend_add { my ($sth, $msg) = @_; my ($err, $device_id, $friend) = split_fields($msg, 2); @@ -374,7 +374,7 @@ sub msg_add_friend { return "ok\0$friend"; } -sub msg_delete_friend { +sub msg_friend_delete { my ($sth, $msg) = @_; return "err\0unimplemented"; @@ -383,7 +383,7 @@ sub msg_delete_friend { # $mutual_friends_delete_sth->execute($device_id, $device_id); } -sub msg_list_get { +sub msg_lists_get { my ($sth, $msg) = @_; my ($err, $device_id) = split_fields($msg, 1); @@ -427,7 +427,7 @@ sub msg_list_get { return "ok\0" . join("\n", @lists); } -sub msg_list_get_other { +sub msg_lists_get_other { my ($sth, $msg) = @_; my ($err, $device_id) = split_fields($msg, 1); @@ -477,7 +477,7 @@ sub msg_list_get_other { return "ok\0" . join("\n", @lists); } -sub msg_list_items { +sub msg_list_items_get { my ($sth, $msg) = @_; my ($err, $device_id, $list_id) = split_fields($msg, 2); @@ -511,7 +511,7 @@ sub msg_list_items { return "ok\0$out"; } -sub msg_ok +sub msg_device_ok { my ($sth, $msg) = @_; diff --git a/server/tests/add_friend/server.log.good b/server/tests/add_friend/server.log.good @@ -1,10 +1,10 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -new_device: success, <digits>:<base64> os <base64> -add_friend: <base64> adding <digits> -add_friend: <base64> adding <base64> -add_friend: bad friends number <base64> -add_friend: <base64> adding <digits> -add_friend: bad friends number <digits> +device_add: success, <digits>:<base64> os <base64> +friend_add: <base64> adding <digits> +friend_add: <base64> adding <base64> +friend_add: bad friends number <base64> +friend_add: <base64> adding <digits> +friend_add: bad friends number <digits> disconnected! diff --git a/server/tests/add_friend/test.pl b/server/tests/add_friend/test.pl @@ -12,28 +12,28 @@ my $friend1 = "4033217654"; my $friend2 = "4033217654bad"; my $msg_good = "friends phone number is not a valid phone number"; -send_msg($sock, 'new_device', "4038675309\0unix"); -my ($msg_data) = recv_msg($sock, 'new_device'); +send_msg($sock, 'device_add', "4038675309\0unix"); +my ($msg_data) = recv_msg($sock, 'device_add'); my $device_id = check_status($msg_data, 'ok'); # first verify that a normal add_friend message succeeds -send_msg($sock, 'add_friend', "$device_id\0$friend1"); -($msg_data) = recv_msg($sock, 'add_friend'); +send_msg($sock, 'friend_add', "$device_id\0$friend1"); +($msg_data) = recv_msg($sock, 'friend_add'); my $phnum = check_status($msg_data, 'ok'); fail "got response ph num '$phnum' expected '$friend1'" if ($phnum ne $friend1); # also verify that a non numeric friends phone number isn't accepted -send_msg($sock, 'add_friend', "$device_id\0$friend2"); -($msg_data) = recv_msg($sock, 'add_friend'); +send_msg($sock, 'friend_add', "$device_id\0$friend2"); +($msg_data) = recv_msg($sock, 'friend_add'); my $msg = check_status($msg_data, 'err'); fail "unexpected error message '$msg', expecting '$msg_good'" if ($msg ne $msg_good); # also verify an empty phone number isn't accepted -send_msg($sock, 'add_friend', "$device_id\0"); -($msg_data) = recv_msg($sock, 'add_friend'); +send_msg($sock, 'friend_add', "$device_id\0"); +($msg_data) = recv_msg($sock, 'friend_add'); $msg = check_status($msg_data, 'err'); fail "unexpected error message '$msg', expecting '$msg_good'" if ($msg ne $msg_good); diff --git a/server/tests/double_register/server.log.good b/server/tests/double_register/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -new_device: success, <digits>:<base64> os <base64> -new_device: phone number <digits> already exists +device_add: success, <digits>:<base64> os <base64> +device_add: phone number <digits> already exists disconnected! diff --git a/server/tests/double_register/test.pl b/server/tests/double_register/test.pl @@ -6,13 +6,13 @@ use test; my $sock = new_socket(); my $phnum = '4038675309'; -send_msg($sock, 'new_device', "$phnum\0unix"); -my ($msg_data) = recv_msg($sock, 'new_device'); +send_msg($sock, 'device_add', "$phnum\0unix"); +my ($msg_data) = recv_msg($sock, 'device_add'); check_status($msg_data, 'ok'); -send_msg($sock, 'new_device', "$phnum\0unix"); -($msg_data) = recv_msg($sock, 'new_device'); +send_msg($sock, 'device_add', "$phnum\0unix"); +($msg_data) = recv_msg($sock, 'device_add'); my $msg = check_status($msg_data, 'err'); my $msg_good = 'the sent phone number already exists'; diff --git a/server/tests/join_list/server.log.good b/server/tests/join_list/server.log.good @@ -1,26 +1,26 @@ accepting connections on <ip>:<port> (pid = <digits>) -add_friend: <base64> adding <digits> -add_friend: <base64> adding <digits> -add_friend: added friend is a member -add_friend: added friend is a member -add_friend: found mutual friendship -add_friend: friends device id is <base64> -add_friend: friends device id is <base64> +device_add: success, <digits>:<base64> os <base64> +device_add: success, <digits>:<base64> os <base64> disconnected! disconnected! -join_list: device <base64> -join_list: device <base64> has been added to list <base64> -join_list: list <base64> -list_get: found list <string> <base64> -list_get: gathering lists for <base64> -list_get: list has 0 items -list_get: list has 2 members +friend_add: <base64> adding <digits> +friend_add: <base64> adding <digits> +friend_add: added friend is a member +friend_add: added friend is a member +friend_add: found mutual friendship +friend_add: friends device id is <base64> +friend_add: friends device id is <base64> +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> +list_join: device <base64> +list_join: device <base64> has been added to list <base64> +list_join: list <base64> +lists_get: found list <string> <base64> +lists_get: gathering lists for <base64> +lists_get: list has 0 items +lists_get: list has 2 members new connection (pid = <digits>) new connection (pid = <digits>) -new_device: success, <digits>:<base64> os <base64> -new_device: success, <digits>:<base64> os <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' diff --git a/server/tests/join_list/test.pl b/server/tests/join_list/test.pl @@ -7,39 +7,39 @@ my ($sock_1, $sock_2) = (new_socket(), new_socket()); my ($phnum_1, $phnum_2) = ("4038675309", "4037082094"); # create device 1 and 2 -send_msg($sock_1, 'new_device', "$phnum_1\0unix"); -my ($msg_data1) = recv_msg($sock_1, 'new_device'); +send_msg($sock_1, 'device_add', "$phnum_1\0unix"); +my ($msg_data1) = recv_msg($sock_1, 'device_add'); -send_msg($sock_2, 'new_device', "$phnum_2\0unix"); -my ($msg_data2) = recv_msg($sock_2, 'new_device'); +send_msg($sock_2, 'device_add', "$phnum_2\0unix"); +my ($msg_data2) = recv_msg($sock_2, 'device_add'); my $device_id1 = check_status($msg_data1, 'ok'); my $device_id2 = check_status($msg_data2, 'ok'); # make device 1 and 2 mutual friends -send_msg($sock_1, 'add_friend', "$device_id1\0$phnum_2"); -recv_msg($sock_1, 'add_friend'); -send_msg($sock_2, 'add_friend', "$device_id2\0$phnum_1"); -recv_msg($sock_2, 'add_friend'); +send_msg($sock_1, 'friend_add', "$device_id1\0$phnum_2"); +recv_msg($sock_1, 'friend_add'); +send_msg($sock_2, 'friend_add', "$device_id2\0$phnum_1"); +recv_msg($sock_2, 'friend_add'); my $list_name = "this is a new list"; # device 1 creates new list -send_msg($sock_1, 'new_list', "$device_id1\0$list_name"); -my ($msg_data) = recv_msg($sock_1, 'new_list'); +send_msg($sock_1, 'list_add', "$device_id1\0$list_name"); +my ($msg_data) = recv_msg($sock_1, 'list_add'); my $msg = check_status($msg_data, 'ok'); my ($list_id) = unpack('Z*', $msg); # device 2 joins the list -send_msg($sock_2, 'join_list', "$device_id2\0$list_id"); -($msg_data) = recv_msg($sock_2, 'join_list'); +send_msg($sock_2, 'list_join', "$device_id2\0$list_id"); +($msg_data) = recv_msg($sock_2, 'list_join'); check_status($msg_data, 'ok'); # device 2 requests its lists to make sure its committed to the list -send_msg($sock_2, 'list_get', $device_id2); -($msg_data) = recv_msg($sock_2, 'list_get'); +send_msg($sock_2, 'lists_get', $device_id2); +($msg_data) = recv_msg($sock_2, 'lists_get'); my $list = check_status($msg_data, 'ok'); my ($id, $name, $num_items, @members) = split("\0", $list); diff --git a/server/tests/join_list_unit/server.log.good b/server/tests/join_list_unit/server.log.good @@ -1,12 +1,12 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -new_device: success, <digits>:<base64> os <base64> -join_list: unknown list <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> -join_list: device <base64> -join_list: list <base64> -join_list: tried to create a duplicate list member entry for device <base64> and list <base64> +device_add: success, <digits>:<base64> os <base64> +list_join: unknown list <base64> +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> +list_join: device <base64> +list_join: list <base64> +list_join: tried to create a duplicate list member entry for device <base64> and list <base64> disconnected! diff --git a/server/tests/join_list_unit/test.pl b/server/tests/join_list_unit/test.pl @@ -8,14 +8,14 @@ use test; my $socket = new_socket(); my $phnum = rand_phnum(); -send_msg($socket, 'new_device', "$phnum\0unix"); -my ($msg_data) = recv_msg($socket, 'new_device'); +send_msg($socket, 'device_add', "$phnum\0unix"); +my ($msg_data) = recv_msg($socket, 'device_add'); my $device_id = check_status($msg_data, 'ok'); # try joining a list that doesn't exist -send_msg($socket, 'join_list', "$device_id\0listdoesntexist"); -($msg_data) = recv_msg($socket, 'join_list'); +send_msg($socket, 'list_join', "$device_id\0listdoesntexist"); +($msg_data) = recv_msg($socket, 'list_join'); my $msg = check_status($msg_data, 'err'); my $msg_good = "the client sent an unknown list id"; @@ -23,14 +23,14 @@ my $msg_good = "the client sent an unknown list id"; fail "unexpected message '$msg', expected '$msg_good'" if ($msg ne $msg_good); # test joining a list your already in -send_msg($socket, 'new_list', "$device_id\0some new list"); -($msg_data) = recv_msg($socket, 'new_list'); +send_msg($socket, 'list_add', "$device_id\0some new list"); +($msg_data) = recv_msg($socket, 'list_add'); $msg = check_status($msg_data, 'ok'); my ($list_id) = unpack('Z*', $msg); -send_msg($socket, 'join_list', "$device_id\0$list_id"); -($msg_data) = recv_msg($socket, 'join_list'); +send_msg($socket, 'list_join', "$device_id\0$list_id"); +($msg_data) = recv_msg($socket, 'list_join'); $msg = check_status($msg_data, 'err'); $msg_good = "the device is already part of this list"; diff --git a/server/tests/leave_list/server.log.good b/server/tests/leave_list/server.log.good @@ -1,14 +1,14 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -new_device: success, <digits>:<base64> os <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> -leave_list: device <base64> -leave_list: list <base64> -leave_list: device <base64> has been removed from list <base64> -leave_list: list <base64> is empty... deleting -list_get: gathering lists for <base64> -list_get_other: gathering lists for <base64> +device_add: success, <digits>:<base64> os <base64> +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> +list_leave: device <base64> +list_leave: list <base64> +list_leave: device <base64> has been removed from list <base64> +list_leave: list <base64> is empty... deleting +lists_get: gathering lists for <base64> +lists_get_other: gathering lists for <base64> disconnected! diff --git a/server/tests/leave_list/test.pl b/server/tests/leave_list/test.pl @@ -9,36 +9,36 @@ my $sock = new_socket(); my $list_name = "this is a new list"; # create a new device id -send_msg($sock, 'new_device', "4038675309\0unix"); -my ($msg_data) = recv_msg($sock, 'new_device'); +send_msg($sock, 'device_add', "4038675309\0unix"); +my ($msg_data) = recv_msg($sock, 'device_add'); my $device_id = check_status($msg_data, 'ok'); # create a new list -send_msg($sock, 'new_list', "$device_id\0$list_name"); -($msg_data) = recv_msg($sock, 'new_list'); +send_msg($sock, 'list_add', "$device_id\0$list_name"); +($msg_data) = recv_msg($sock, 'list_add'); my $msg = check_status($msg_data, 'ok'); my ($list_id) = split("\0", $msg); # leave the list -send_msg($sock, 'leave_list', "$device_id\0$list_id"); -($msg_data) = recv_msg($sock, 'leave_list'); +send_msg($sock, 'list_leave', "$device_id\0$list_id"); +($msg_data) = recv_msg($sock, 'list_leave'); $msg = check_status($msg_data, 'ok'); my ($leave_id) = split("\0", $msg); fail "got leave data '$leave_id', expected $list_id" if ($leave_id ne $list_id); # verify we don't get this list back when requesting all lists -send_msg($sock, 'list_get', $device_id); -($msg_data) = recv_msg($sock, 'list_get'); +send_msg($sock, 'lists_get', $device_id); +($msg_data) = recv_msg($sock, 'lists_get'); my $lists = check_status($msg_data, 'ok'); fail "expected no lists" if ($lists ne ""); # verify we don't get this list back when requesting other lists -send_msg($sock, 'list_get_other', $device_id); -($msg_data) = recv_msg($sock, 'list_get_other'); +send_msg($sock, 'lists_get_other', $device_id); +($msg_data) = recv_msg($sock, 'lists_get_other'); $lists = check_status($msg_data, 'ok'); fail "expected no lists" if ($lists ne ""); diff --git a/server/tests/leave_list_unit/server.log.good b/server/tests/leave_list_unit/server.log.good @@ -1,7 +1,7 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -leave_list: unknown device <base64> -new_device: success, <digits>:<base64> os <base64> -leave_list: unknown list <base64> +list_leave: unknown device <base64> +device_add: success, <digits>:<base64> os <base64> +list_leave: unknown list <base64> disconnected! diff --git a/server/tests/leave_list_unit/test.pl b/server/tests/leave_list_unit/test.pl @@ -6,21 +6,21 @@ use test; my $sock = new_socket(); # send a leave list message with a bad device id -send_msg($sock, 'leave_list', "somenonexistentdeviceid\0somelistid"); -my ($msg_data) = recv_msg($sock, 'leave_list'); +send_msg($sock, 'list_leave', "somenonexistentdeviceid\0somelistid"); +my ($msg_data) = recv_msg($sock, 'list_leave'); my $msg = check_status($msg_data, 'err'); my $msg_good = "the client sent an unknown device id"; fail "unexpected message '$msg', expected '$msg'" if ($msg ne $msg_good); # send a message with a valid device id but bad list id -send_msg($sock, 'new_device', "4038675309\0unix"); -($msg_data) = recv_msg($sock, 'new_device'); +send_msg($sock, 'device_add', "4038675309\0unix"); +($msg_data) = recv_msg($sock, 'device_add'); my $device_id = check_status($msg_data, 'ok'); -send_msg($sock, 'leave_list', "$device_id\0somenonexistentlistid"); -($msg_data) = recv_msg($sock, 'leave_list'); +send_msg($sock, 'list_leave', "$device_id\0somenonexistentlistid"); +($msg_data) = recv_msg($sock, 'list_leave'); $msg = check_status($msg_data, 'err'); $msg_good = "the client sent an unknown list id"; diff --git a/server/tests/list_get/server.log.good b/server/tests/list_get/server.log.good @@ -1,24 +1,24 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -new_device: success, <digits>:<base64> os <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> -list_get: gathering lists for <base64> -list_get: found list <string> <base64> -list_get: list has 1 members -list_get: list has 0 items -list_get: found list <string> <base64> -list_get: list has 1 members -list_get: list has 0 items -list_get: found list <string> <base64> -list_get: list has 1 members -list_get: list has 0 items +device_add: success, <digits>:<base64> os <base64> +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> +lists_get: gathering lists for <base64> +lists_get: found list <string> <base64> +lists_get: list has 1 members +lists_get: list has 0 items +lists_get: found list <string> <base64> +lists_get: list has 1 members +lists_get: list has 0 items +lists_get: found list <string> <base64> +lists_get: list has 1 members +lists_get: list has 0 items disconnected! diff --git a/server/tests/list_get/test.pl b/server/tests/list_get/test.pl @@ -12,15 +12,15 @@ use test; my $phone_num = "4038675309"; my $sock = new_socket(); -send_msg($sock, 'new_device', "$phone_num\0unix"); -my ($msg_data) = recv_msg($sock, 'new_device'); +send_msg($sock, 'device_add', "$phone_num\0unix"); +my ($msg_data) = recv_msg($sock, 'device_add'); my $device_id = check_status($msg_data, 'ok'); my %list_id_map; for my $name ("new list 1", "new list 2", "new list 3") { - send_msg($sock, 'new_list', "$device_id\0$name"); - my ($msg_data) = recv_msg($sock, 'new_list'); + send_msg($sock, 'list_add', "$device_id\0$name"); + my ($msg_data) = recv_msg($sock, 'list_add'); my $data = check_status($msg_data, 'ok'); my ($id, $name, $member) = split("\0", $data); @@ -28,8 +28,8 @@ for my $name ("new list 1", "new list 2", "new list 3") { $list_id_map{$name} = $id; } -send_msg($sock, 'list_get', $device_id); -($msg_data) = recv_msg($sock, 'list_get'); +send_msg($sock, 'lists_get', $device_id); +($msg_data) = recv_msg($sock, 'lists_get'); my $lists = check_status($msg_data, 'ok'); my $num_lists = 0; diff --git a/server/tests/list_get_other/server.log.good b/server/tests/list_get_other/server.log.good @@ -1,22 +1,22 @@ accepting connections on <ip>:<port> (pid = <digits>) -add_friend: <base64> adding <digits> -add_friend: <base64> adding <digits> -add_friend: added friend is a member -add_friend: added friend is a member -add_friend: found mutual friendship -add_friend: friends device id is <base64> -add_friend: friends device id is <base64> +device_add: success, <digits>:<base64> os <base64> +device_add: success, <digits>:<base64> os <base64> disconnected! disconnected! -list_get_other: found list <string> -list_get_other: found mutual friend <base64> -list_get_other: gathering lists for <base64> +friend_add: <base64> adding <digits> +friend_add: <base64> adding <digits> +friend_add: added friend is a member +friend_add: added friend is a member +friend_add: found mutual friendship +friend_add: friends device id is <base64> +friend_add: friends device id is <base64> +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> +lists_get_other: found list <string> +lists_get_other: found mutual friend <base64> +lists_get_other: gathering lists for <base64> new connection (pid = <digits>) new connection (pid = <digits>) -new_device: success, <digits>:<base64> os <base64> -new_device: success, <digits>:<base64> os <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' diff --git a/server/tests/list_get_other/test.pl b/server/tests/list_get_other/test.pl @@ -12,32 +12,32 @@ use test; my ($sock_1, $sock_2) = (new_socket(), new_socket()); my ($phnum_1, $phnum_2) = ("4038675309", "4037082094"); -send_msg($sock_1, 'new_device', "$phnum_1\0unix"); -my ($msg_1) = recv_msg($sock_1, 'new_device'); +send_msg($sock_1, 'device_add', "$phnum_1\0unix"); +my ($msg_1) = recv_msg($sock_1, 'device_add'); -send_msg($sock_2, 'new_device', "$phnum_2\0unix"); -my ($msg_2) = recv_msg($sock_2, 'new_device'); +send_msg($sock_2, 'device_add', "$phnum_2\0unix"); +my ($msg_2) = recv_msg($sock_2, 'device_add'); my $device_id1 = check_status($msg_1, 'ok'); my $device_id2 = check_status($msg_2, 'ok'); # the mutual friend relationship, computer style -send_msg($sock_1, 'add_friend', "$device_id1\0$phnum_2"); -recv_msg($sock_1, 'add_friend'); -send_msg($sock_2, 'add_friend', "$device_id2\0$phnum_1"); -recv_msg($sock_2, 'add_friend'); +send_msg($sock_1, 'friend_add', "$device_id1\0$phnum_2"); +recv_msg($sock_1, 'friend_add'); +send_msg($sock_2, 'friend_add', "$device_id2\0$phnum_1"); +recv_msg($sock_2, 'friend_add'); my $list_name = "this is a new list"; -send_msg($sock_1, 'new_list', "$device_id1\0$list_name"); -my ($msg_data) = recv_msg($sock_1, 'new_list'); +send_msg($sock_1, 'list_add', "$device_id1\0$list_name"); +my ($msg_data) = recv_msg($sock_1, 'list_add'); my $list_data = check_status($msg_data, 'ok'); my ($list_id) = split("\0", $list_data); # make sure socket 2 can see socket 1's list -send_msg($sock_2, 'list_get_other', $device_id2); -($msg_data) = recv_msg($sock_2, 'list_get_other'); +send_msg($sock_2, 'lists_get_other', $device_id2); +($msg_data) = recv_msg($sock_2, 'lists_get_other'); my $other_lists = check_status($msg_data, 'ok'); my $num_lists = 0; diff --git a/server/tests/list_reference_counting/server.log.good b/server/tests/list_reference_counting/server.log.good @@ -1,26 +1,26 @@ accepting connections on <ip>:<port> (pid = <digits>) +device_add: success, <digits>:<base64> os <base64> +device_add: success, <digits>:<base64> os <base64> disconnected! disconnected! -join_list: device <base64> -join_list: device <base64> has been added to list <base64> -join_list: list <base64> -leave_list: device <base64> -leave_list: device <base64> -leave_list: device <base64> has been removed from list <base64> -leave_list: device <base64> has been removed from list <base64> -leave_list: list <base64> -leave_list: list <base64> -leave_list: list <base64> is empty... deleting -list_get: found list <string> <base64> -list_get: gathering lists for <base64> -list_get: list has 0 items -list_get: list has 1 members +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> +list_join: device <base64> +list_join: device <base64> has been added to list <base64> +list_join: list <base64> +list_leave: device <base64> +list_leave: device <base64> +list_leave: device <base64> has been removed from list <base64> +list_leave: device <base64> has been removed from list <base64> +list_leave: list <base64> +list_leave: list <base64> +list_leave: list <base64> is empty... deleting +lists_get: found list <string> <base64> +lists_get: gathering lists for <base64> +lists_get: list has 0 items +lists_get: list has 1 members new connection (pid = <digits>) new connection (pid = <digits>) -new_device: success, <digits>:<base64> os <base64> -new_device: success, <digits>:<base64> os <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' diff --git a/server/tests/list_reference_counting/test.pl b/server/tests/list_reference_counting/test.pl @@ -11,34 +11,34 @@ my ($sockets, $phnums, $device_ids) = create_devices(2); my $list_name = "this is a new list"; # A creates a new list -send_msg($$sockets[0], 'new_list', "$$device_ids[0]\0$list_name"); -my ($msg_data) = recv_msg($$sockets[0], 'new_list'); +send_msg($$sockets[0], 'list_add', "$$device_ids[0]\0$list_name"); +my ($msg_data) = recv_msg($$sockets[0], 'list_add'); my $msg = check_status($msg_data, 'ok'); my ($list_id) = split("\0", $msg); # B joins the list -send_msg($$sockets[1], 'join_list', "$$device_ids[1]\0$list_id"); -($msg_data) = recv_msg($$sockets[1], 'join_list'); +send_msg($$sockets[1], 'list_join', "$$device_ids[1]\0$list_id"); +($msg_data) = recv_msg($$sockets[1], 'list_join'); check_status($msg_data, 'ok'); # A leaves the list -send_msg($$sockets[0], 'leave_list', "$$device_ids[0]\0$list_id"); -($msg_data) = recv_msg($$sockets[0], 'leave_list'); +send_msg($$sockets[0], 'list_leave', "$$device_ids[0]\0$list_id"); +($msg_data) = recv_msg($$sockets[0], 'list_leave'); $msg = check_status($msg_data, 'ok'); # B verifies its still in the list -send_msg($$sockets[1], 'list_get', $$device_ids[1]); -($msg_data) = recv_msg($$sockets[1], 'list_get'); +send_msg($$sockets[1], 'lists_get', $$device_ids[1]); +($msg_data) = recv_msg($$sockets[1], 'lists_get'); my $lists = check_status($msg_data, 'ok'); my @lists = split("\n", $lists); fail "expected 1 list, got " . @lists if (@lists != 1); # B also leaves the list -send_msg($$sockets[1], 'leave_list', "$$device_ids[1]\0$list_id"); -($msg_data) = recv_msg($$sockets[1], 'leave_list'); +send_msg($$sockets[1], 'list_leave', "$$device_ids[1]\0$list_id"); +($msg_data) = recv_msg($$sockets[1], 'list_leave'); $msg = check_status($msg_data, 'ok'); diff --git a/server/tests/msg_ok/server.log.good b/server/tests/msg_ok/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -new_device: success, <digits>:<base64> os <base64> -ok: device <base64> checking in +device_add: success, <digits>:<base64> os <base64> +device_ok: device <base64> checking in disconnected! diff --git a/server/tests/msg_ok/test.pl b/server/tests/msg_ok/test.pl @@ -5,13 +5,13 @@ use test; my $sock = new_socket(); -send_msg($sock, 'new_device', "4038675309\0unix"); -my ($msg_data, $length) = recv_msg($sock, 'new_device'); +send_msg($sock, 'device_add', "4038675309\0unix"); +my ($msg_data, $length) = recv_msg($sock, 'device_add'); my $device_id = check_status($msg_data, 'ok'); -send_msg($sock, 'ok', $device_id); -($msg_data, $length) = recv_msg($sock, 'ok'); +send_msg($sock, 'device_ok', $device_id); +($msg_data, $length) = recv_msg($sock, 'device_ok'); check_status($msg_data, 'ok'); fail "expected response size 3, got $length" if ($length != 3); diff --git a/server/tests/msgs.pl b/server/tests/msgs.pl @@ -1,42 +1,42 @@ #!/usr/bin/perl -# generated Mon Dec 28 00:59:49 MST 2015 +# generated 'Sat Jan 2 16:41:19 MST 2016' use strict; use warnings; our $protocol_ver = 0; our %msg_num = ( - new_device => 0, - add_friend => 1, - new_list => 2, - join_list => 3, - leave_list => 4, - list_get => 5, - list_get_other => 6, - list_items => 7, - new_list_item => 8, - ok => 9, + device_add => 0, + device_ok => 1, + friend_add => 2, + list_add => 3, + list_join => 4, + list_leave => 5, + lists_get => 6, + lists_get_other => 7, + list_items_get => 8, + list_item_add => 9, ); our @msg_str = ( - 'new_device', - 'add_friend', - 'new_list', - 'join_list', - 'leave_list', - 'list_get', - 'list_get_other', - 'list_items', - 'new_list_item', - 'ok', + 'device_add', + 'device_ok', + 'friend_add', + 'list_add', + 'list_join', + 'list_leave', + 'lists_get', + 'lists_get_other', + 'list_items_get', + 'list_item_add', ); our @msg_func = ( - \&msg_new_device, - \&msg_add_friend, - \&msg_new_list, - \&msg_join_list, - \&msg_leave_list, - \&msg_list_get, - \&msg_list_get_other, - \&msg_list_items, - \&msg_new_list_item, - \&msg_ok, + \&msg_device_add, + \&msg_device_ok, + \&msg_friend_add, + \&msg_list_add, + \&msg_list_join, + \&msg_list_leave, + \&msg_lists_get, + \&msg_lists_get_other, + \&msg_list_items_get, + \&msg_list_item_add, ); diff --git a/server/tests/multiple_friends_same_other_list/server.log.good b/server/tests/multiple_friends_same_other_list/server.log.good @@ -1,38 +1,38 @@ accepting connections on <ip>:<port> (pid = <digits>) -add_friend: <base64> adding <digits> -add_friend: <base64> adding <digits> -add_friend: <base64> adding <digits> -add_friend: <base64> adding <digits> -add_friend: added friend is a member -add_friend: added friend is a member -add_friend: added friend is a member -add_friend: added friend is a member -add_friend: found mutual friendship -add_friend: found mutual friendship -add_friend: friends device id is <base64> -add_friend: friends device id is <base64> -add_friend: friends device id is <base64> -add_friend: friends device id is <base64> +device_add: success, <digits>:<base64> os <base64> +device_add: success, <digits>:<base64> os <base64> +device_add: success, <digits>:<base64> os <base64> disconnected! disconnected! disconnected! -join_list: device <base64> -join_list: device <base64> has been added to list <base64> -join_list: list <base64> -list_get_other: found list <string> -list_get_other: found list <string> -list_get_other: found mutual friend <base64> -list_get_other: found mutual friend <base64> -list_get_other: gathering lists for <base64> +friend_add: <base64> adding <digits> +friend_add: <base64> adding <digits> +friend_add: <base64> adding <digits> +friend_add: <base64> adding <digits> +friend_add: added friend is a member +friend_add: added friend is a member +friend_add: added friend is a member +friend_add: added friend is a member +friend_add: found mutual friendship +friend_add: found mutual friendship +friend_add: friends device id is <base64> +friend_add: friends device id is <base64> +friend_add: friends device id is <base64> +friend_add: friends device id is <base64> +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> +list_join: device <base64> +list_join: device <base64> has been added to list <base64> +list_join: list <base64> +lists_get_other: found list <string> +lists_get_other: found list <string> +lists_get_other: found mutual friend <base64> +lists_get_other: found mutual friend <base64> +lists_get_other: gathering lists for <base64> new connection (pid = <digits>) new connection (pid = <digits>) new connection (pid = <digits>) -new_device: success, <digits>:<base64> os <base64> -new_device: success, <digits>:<base64> os <base64> -new_device: success, <digits>:<base64> os <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' diff --git a/server/tests/multiple_friends_same_other_list/test.pl b/server/tests/multiple_friends_same_other_list/test.pl @@ -10,32 +10,32 @@ use test; my ($sockets, $phnums, $device_ids) = create_devices(3); # 0 and 1 need to be mutual friends -send_msg($$sockets[0], 'add_friend', "$$device_ids[0]\0$$phnums[1]"); -recv_msg($$sockets[0], 'add_friend'); -send_msg($$sockets[1], 'add_friend', "$$device_ids[1]\0$$phnums[0]"); -recv_msg($$sockets[1], 'add_friend'); +send_msg($$sockets[0], 'friend_add', "$$device_ids[0]\0$$phnums[1]"); +recv_msg($$sockets[0], 'friend_add'); +send_msg($$sockets[1], 'friend_add', "$$device_ids[1]\0$$phnums[0]"); +recv_msg($$sockets[1], 'friend_add'); # 0 and 2 need to be mutual friends too -send_msg($$sockets[0], 'add_friend', "$$device_ids[0]\0$$phnums[2]"); -recv_msg($$sockets[0], 'add_friend'); -send_msg($$sockets[2], 'add_friend', "$$device_ids[2]\0$$phnums[0]"); -recv_msg($$sockets[2], 'add_friend'); +send_msg($$sockets[0], 'friend_add', "$$device_ids[0]\0$$phnums[2]"); +recv_msg($$sockets[0], 'friend_add'); +send_msg($$sockets[2], 'friend_add', "$$device_ids[2]\0$$phnums[0]"); +recv_msg($$sockets[2], 'friend_add'); # 1 and 2 need to be in the same list -send_msg($$sockets[1], 'new_list', "$$device_ids[1]\0this is a new list"); -my ($msg_data) = recv_msg($$sockets[1], 'new_list'); +send_msg($$sockets[1], 'list_add', "$$device_ids[1]\0this is a new list"); +my ($msg_data) = recv_msg($$sockets[1], 'list_add'); my $list_data = check_status($msg_data, 'ok'); my ($list_id) = split("\0", $list_data); -send_msg($$sockets[2], 'join_list', "$$device_ids[2]\0$list_id"); -($msg_data) = recv_msg($$sockets[2], 'join_list'); +send_msg($$sockets[2], 'list_join', "$$device_ids[2]\0$list_id"); +($msg_data) = recv_msg($$sockets[2], 'list_join'); check_status($msg_data, 'ok'); # 0 requests his other lists -send_msg($$sockets[0], 'list_get_other', "$$device_ids[0]"); -($msg_data) = recv_msg($$sockets[0], 'list_get_other'); +send_msg($$sockets[0], 'lists_get_other', "$$device_ids[0]"); +($msg_data) = recv_msg($$sockets[0], 'lists_get_other'); my $raw_lists = check_status($msg_data, 'ok'); my @lists = split("\n", $raw_lists); diff --git a/server/tests/new_device/server.log.good b/server/tests/new_device/server.log.good @@ -1,6 +1,6 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -new_device: success, <digits>:<base64> os <base64> -new_device: phone number '403867530&' invalid +device_add: success, <digits>:<base64> os <base64> +device_add: phone number '403867530&' invalid disconnected! diff --git a/server/tests/new_device/test.pl b/server/tests/new_device/test.pl @@ -6,16 +6,16 @@ use test; # send a valid number and verify response is ok my $sock = new_socket(); -send_msg($sock, 'new_device', "4038675309\0unix"); -my ($msg_data, $length) = recv_msg($sock, 'new_device'); +send_msg($sock, 'device_add', "4038675309\0unix"); +my ($msg_data, $length) = recv_msg($sock, 'device_add'); my $msg = check_status($msg_data, 'ok'); fail "expected response length of 46, got $length" if ($length != 46); fail "response '$msg' not base64" unless ($msg =~ m/^[a-zA-Z0-9+\/=]+$/); # send a bad phone number and verify error response -send_msg($sock, 'new_device', "403867530&\0unix"); -($msg_data) = recv_msg($sock, 'new_device'); +send_msg($sock, 'device_add', "403867530&\0unix"); +($msg_data) = recv_msg($sock, 'device_add'); $msg = check_status($msg_data, 'err'); my $fail_msg = 'the sent phone number is not a number'; diff --git a/server/tests/new_list/server.log.good b/server/tests/new_list/server.log.good @@ -1,11 +1,11 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -new_device: success, <digits>:<base64> os <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> -new_list: <digits> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> +device_add: success, <digits>:<base64> os <base64> +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> +list_add: <digits> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> disconnected! diff --git a/server/tests/new_list/test.pl b/server/tests/new_list/test.pl @@ -11,14 +11,14 @@ my $sock = new_socket(); my $phnum = "4038675309"; my $list_name = "this is a new list"; -send_msg($sock, 'new_device', "$phnum\0unix"); -my ($payload) = recv_msg($sock, 'new_device'); +send_msg($sock, 'device_add', "$phnum\0unix"); +my ($payload) = recv_msg($sock, 'device_add'); my $device_id = check_status($payload, 'ok'); # verify a normal new_list request succeeds and returns good information -send_msg($sock, 'new_list', "$device_id\0$list_name"); -($payload) = recv_msg($sock, 'new_list'); +send_msg($sock, 'list_add', "$device_id\0$list_name"); +($payload) = recv_msg($sock, 'list_add'); my $list_data = check_status($payload, 'ok'); my ($id, $name, @members) = split("\0", $list_data); @@ -30,7 +30,7 @@ fail "list does not have exactly 1 member" if (@members != 1); fail "got list member '$members[0]', expected '$phnum'" if ($members[0] ne $phnum); # verify a new_list request with an empty list name succeeds -send_msg($sock, 'new_list', "$device_id\0"); -($payload) = recv_msg($sock, 'new_list'); +send_msg($sock, 'list_add', "$device_id\0"); +($payload) = recv_msg($sock, 'list_add'); my $msg = check_status($payload, 'ok'); diff --git a/server/tests/payload_invalid/server.log.good b/server/tests/payload_invalid/server.log.good @@ -4,14 +4,14 @@ ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' error: 7000 byte message too large new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -add_friend: got 0 fields, expected 2 -join_list: got 0 fields, expected 2 -leave_list: got 0 fields, expected 2 -list_get: got 0 fields, expected 1 -list_get_other: got 0 fields, expected 1 -list_items: got 0 fields, expected 2 -new_device: got 0 fields, expected 2 -new_list: got 0 fields, expected 2 -new_list_item: got 0 fields, expected 1 -ok: got 0 fields, expected 1 +device_add: got 0 fields, expected 2 +device_ok: got 0 fields, expected 1 +friend_add: got 0 fields, expected 2 +list_add: got 0 fields, expected 2 +list_item_add: got 0 fields, expected 1 +list_items_get: got 0 fields, expected 2 +list_join: got 0 fields, expected 2 +list_leave: got 0 fields, expected 2 +lists_get: got 0 fields, expected 1 +lists_get_other: got 0 fields, expected 1 disconnected! diff --git a/server/tests/payload_invalid/test.pl b/server/tests/payload_invalid/test.pl @@ -4,7 +4,7 @@ use warnings; use test; # send message that's too long -send_msg(new_socket(), 'new_device', "longstr" x 1000); +send_msg(new_socket(), 'device_add', "longstr" x 1000); # send message size 0 to all message types my $sock = new_socket(); diff --git a/server/tests/test.pm b/server/tests/test.pm @@ -32,8 +32,8 @@ sub create_devices { my $sock = new_socket(); my $phnum = rand_phnum(); - send_msg($sock, 'new_device', "$phnum\0unix"); - my ($msg) = recv_msg($sock, 'new_device'); + send_msg($sock, 'device_add', "$phnum\0unix"); + my ($msg) = recv_msg($sock, 'device_add'); my $device_id = check_status($msg, 'ok'); diff --git a/server/tests/two_lists_same_name/server.log.good b/server/tests/two_lists_same_name/server.log.good @@ -1,11 +1,11 @@ accepting connections on <ip>:<port> (pid = <digits>) new connection (pid = <digits>) ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256' -new_device: success, <digits>:<base64> os <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> -new_list: <string> -new_list: adding first member devid = <base64> -new_list: fingerprint = <base64> +device_add: success, <digits>:<base64> os <base64> +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> +list_add: <string> +list_add: adding first member devid = <base64> +list_add: fingerprint = <base64> disconnected! diff --git a/server/tests/two_lists_same_name/test.pl b/server/tests/two_lists_same_name/test.pl @@ -10,19 +10,19 @@ use test; my $sock = new_socket(); -send_msg($sock, 'new_device', "4038675309\0unix"); -my ($msg_data, $length) = recv_msg($sock, 'new_device'); +send_msg($sock, 'device_add', "4038675309\0unix"); +my ($msg_data, $length) = recv_msg($sock, 'device_add'); my $device_id = check_status($msg_data, 'ok'); my $list_name = "this is a new list"; -send_msg($sock, 'new_list', "$device_id\0$list_name"); -($msg_data) = recv_msg($sock, 'new_list'); +send_msg($sock, 'list_add', "$device_id\0$list_name"); +($msg_data) = recv_msg($sock, 'list_add'); check_status($msg_data, 'ok'); # add the same list again -send_msg($sock, 'new_list', "$device_id\0$list_name"); -($msg_data, $length) = recv_msg($sock, 'new_list'); +send_msg($sock, 'list_add', "$device_id\0$list_name"); +($msg_data, $length) = recv_msg($sock, 'list_add'); my $msg = check_status($msg_data, 'ok');