diff options
author | irungentoo <irungentoo@gmail.com> | 2015-02-24 20:29:01 -0500 |
---|---|---|
committer | irungentoo <irungentoo@gmail.com> | 2015-02-24 20:29:01 -0500 |
commit | d83efd35dd342da7f5b0f4b6e11ffd943d7f3c63 (patch) | |
tree | 4fa5e862c65c9bb9a007dab78424c161ddd61341 /testing/Messenger_test.c | |
parent | 8fa8e9dcd798540bf539d502d0dbba71184f7489 (diff) |
Ported some of the code in testing/ to the new api.
Diffstat (limited to 'testing/Messenger_test.c')
-rw-r--r-- | testing/Messenger_test.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testing/Messenger_test.c b/testing/Messenger_test.c index 42cadf73..27216107 100644 --- a/testing/Messenger_test.c +++ b/testing/Messenger_test.c | |||
@@ -56,17 +56,17 @@ | |||
56 | 56 | ||
57 | #endif | 57 | #endif |
58 | 58 | ||
59 | void print_message(Messenger *m, int friendnumber, const uint8_t *string, uint16_t length, void *userdata) | 59 | void print_message(Messenger *m, uint32_t friendnumber, const uint8_t *string, size_t length, void *userdata) |
60 | { | 60 | { |
61 | printf("Message with length %u received from %u: %s \n", length, friendnumber, string); | 61 | printf("Message with length %lu received from %u: %s \n", length, friendnumber, string); |
62 | m_sendmessage(m, friendnumber, (uint8_t *)"Test1", 6); | 62 | m_sendmessage(m, friendnumber, (uint8_t *)"Test1", 6, 0); |
63 | } | 63 | } |
64 | 64 | ||
65 | /* FIXME needed as print_request has to match the interface expected by | 65 | /* FIXME needed as print_request has to match the interface expected by |
66 | * networking_requesthandler and so cannot take a Messenger * */ | 66 | * networking_requesthandler and so cannot take a Messenger * */ |
67 | static Messenger *m; | 67 | static Messenger *m; |
68 | 68 | ||
69 | void print_request(Messenger *m, const uint8_t *public_key, const uint8_t *data, uint16_t length, void *userdata) | 69 | void print_request(Messenger *m, const uint8_t *public_key, const uint8_t *data, size_t length, void *userdata) |
70 | { | 70 | { |
71 | printf("Friend request received from: \n"); | 71 | printf("Friend request received from: \n"); |
72 | printf("ClientID: "); | 72 | printf("ClientID: "); |
@@ -79,7 +79,7 @@ void print_request(Messenger *m, const uint8_t *public_key, const uint8_t *data, | |||
79 | printf("%hhX", public_key[j]); | 79 | printf("%hhX", public_key[j]); |
80 | } | 80 | } |
81 | 81 | ||
82 | printf("\nOf length: %u with data: %s \n", length, data); | 82 | printf("\nOf length: %lu with data: %s \n", length, data); |
83 | 83 | ||
84 | if (length != sizeof("Install Gentoo")) { | 84 | if (length != sizeof("Install Gentoo")) { |
85 | return; | 85 | return; |
@@ -184,7 +184,7 @@ int main(int argc, char *argv[]) | |||
184 | getname(m, num, name); | 184 | getname(m, num, name); |
185 | printf("%s\n", name); | 185 | printf("%s\n", name); |
186 | 186 | ||
187 | m_sendmessage(m, num, (uint8_t *)"Test", 5); | 187 | m_sendmessage(m, num, (uint8_t *)"Test", 5, 0); |
188 | do_messenger(m); | 188 | do_messenger(m); |
189 | c_sleep(30); | 189 | c_sleep(30); |
190 | FILE *file = fopen("Save.bak", "wb"); | 190 | FILE *file = fopen("Save.bak", "wb"); |