diff options
Diffstat (limited to 'src/messenger/gnunet-service-messenger_message_kind.c')
-rw-r--r-- | src/messenger/gnunet-service-messenger_message_kind.c | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/src/messenger/gnunet-service-messenger_message_kind.c b/src/messenger/gnunet-service-messenger_message_kind.c index 688dd2fd9..0cc3afeaf 100644 --- a/src/messenger/gnunet-service-messenger_message_kind.c +++ b/src/messenger/gnunet-service-messenger_message_kind.c | |||
@@ -31,12 +31,13 @@ | |||
31 | struct GNUNET_MESSENGER_Message* | 31 | struct GNUNET_MESSENGER_Message* |
32 | create_message_info (struct GNUNET_MESSENGER_Service *service) | 32 | create_message_info (struct GNUNET_MESSENGER_Service *service) |
33 | { | 33 | { |
34 | if (!service) | 34 | if (! service) |
35 | return NULL; | 35 | return NULL; |
36 | 36 | ||
37 | struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_INFO); | 37 | struct GNUNET_MESSENGER_Message *message = create_message ( |
38 | GNUNET_MESSENGER_KIND_INFO); | ||
38 | 39 | ||
39 | if (!message) | 40 | if (! message) |
40 | return NULL; | 41 | return NULL; |
41 | 42 | ||
42 | message->body.info.messenger_version = GNUNET_MESSENGER_VERSION; | 43 | message->body.info.messenger_version = GNUNET_MESSENGER_VERSION; |
@@ -44,18 +45,21 @@ create_message_info (struct GNUNET_MESSENGER_Service *service) | |||
44 | return message; | 45 | return message; |
45 | } | 46 | } |
46 | 47 | ||
48 | |||
47 | struct GNUNET_MESSENGER_Message* | 49 | struct GNUNET_MESSENGER_Message* |
48 | create_message_peer (struct GNUNET_MESSENGER_Service *service) | 50 | create_message_peer (struct GNUNET_MESSENGER_Service *service) |
49 | { | 51 | { |
50 | if (!service) | 52 | if (! service) |
51 | return NULL; | 53 | return NULL; |
52 | 54 | ||
53 | struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_PEER); | 55 | struct GNUNET_MESSENGER_Message *message = create_message ( |
56 | GNUNET_MESSENGER_KIND_PEER); | ||
54 | 57 | ||
55 | if (!message) | 58 | if (! message) |
56 | return NULL; | 59 | return NULL; |
57 | 60 | ||
58 | if (GNUNET_OK == get_service_peer_identity (service, &(message->body.peer.peer))) | 61 | if (GNUNET_OK == get_service_peer_identity (service, |
62 | &(message->body.peer.peer))) | ||
59 | return message; | 63 | return message; |
60 | else | 64 | else |
61 | { | 65 | { |
@@ -64,36 +68,42 @@ create_message_peer (struct GNUNET_MESSENGER_Service *service) | |||
64 | } | 68 | } |
65 | } | 69 | } |
66 | 70 | ||
71 | |||
67 | struct GNUNET_MESSENGER_Message* | 72 | struct GNUNET_MESSENGER_Message* |
68 | create_message_miss (const struct GNUNET_PeerIdentity *peer) | 73 | create_message_miss (const struct GNUNET_PeerIdentity *peer) |
69 | { | 74 | { |
70 | if (!peer) | 75 | if (! peer) |
71 | return NULL; | 76 | return NULL; |
72 | 77 | ||
73 | struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_MISS); | 78 | struct GNUNET_MESSENGER_Message *message = create_message ( |
79 | GNUNET_MESSENGER_KIND_MISS); | ||
74 | 80 | ||
75 | if (!message) | 81 | if (! message) |
76 | { | 82 | { |
77 | return NULL; | 83 | return NULL; |
78 | } | 84 | } |
79 | 85 | ||
80 | GNUNET_memcpy(&(message->body.miss.peer), peer, sizeof(struct GNUNET_PeerIdentity)); | 86 | GNUNET_memcpy (&(message->body.miss.peer), peer, sizeof(struct |
87 | GNUNET_PeerIdentity)); | ||
81 | 88 | ||
82 | return message; | 89 | return message; |
83 | } | 90 | } |
84 | 91 | ||
92 | |||
85 | struct GNUNET_MESSENGER_Message* | 93 | struct GNUNET_MESSENGER_Message* |
86 | create_message_merge (const struct GNUNET_HashCode *previous) | 94 | create_message_merge (const struct GNUNET_HashCode *previous) |
87 | { | 95 | { |
88 | if (!previous) | 96 | if (! previous) |
89 | return NULL; | 97 | return NULL; |
90 | 98 | ||
91 | struct GNUNET_MESSENGER_Message *message = create_message (GNUNET_MESSENGER_KIND_MERGE); | 99 | struct GNUNET_MESSENGER_Message *message = create_message ( |
100 | GNUNET_MESSENGER_KIND_MERGE); | ||
92 | 101 | ||
93 | if (!message) | 102 | if (! message) |
94 | return NULL; | 103 | return NULL; |
95 | 104 | ||
96 | GNUNET_memcpy(&(message->body.merge.previous), previous, sizeof(struct GNUNET_HashCode)); | 105 | GNUNET_memcpy (&(message->body.merge.previous), previous, sizeof(struct |
106 | GNUNET_HashCode)); | ||
97 | 107 | ||
98 | return message; | 108 | return message; |
99 | } | 109 | } |