diff options
Diffstat (limited to 'src/messenger/gnunet-service-messenger_member_store.c')
-rw-r--r-- | src/messenger/gnunet-service-messenger_member_store.c | 44 |
1 files changed, 31 insertions, 13 deletions
diff --git a/src/messenger/gnunet-service-messenger_member_store.c b/src/messenger/gnunet-service-messenger_member_store.c index 2925965d4..e96ee3883 100644 --- a/src/messenger/gnunet-service-messenger_member_store.c +++ b/src/messenger/gnunet-service-messenger_member_store.c | |||
@@ -30,7 +30,8 @@ | |||
30 | #include "gnunet-service-messenger_room.h" | 30 | #include "gnunet-service-messenger_room.h" |
31 | 31 | ||
32 | void | 32 | void |
33 | init_member_store (struct GNUNET_MESSENGER_MemberStore *store, struct GNUNET_MESSENGER_SrvRoom *room) | 33 | init_member_store (struct GNUNET_MESSENGER_MemberStore *store, |
34 | struct GNUNET_MESSENGER_SrvRoom *room) | ||
34 | { | 35 | { |
35 | GNUNET_assert ((store) && (room)); | 36 | GNUNET_assert ((store) && (room)); |
36 | 37 | ||
@@ -39,7 +40,9 @@ init_member_store (struct GNUNET_MESSENGER_MemberStore *store, struct GNUNET_MES | |||
39 | } | 40 | } |
40 | 41 | ||
41 | static int | 42 | static int |
42 | iterate_destroy_members (void *cls, const struct GNUNET_ShortHashCode *key, void *value) | 43 | iterate_destroy_members (void *cls, |
44 | const struct GNUNET_ShortHashCode *key, | ||
45 | void *value) | ||
43 | { | 46 | { |
44 | struct GNUNET_MESSENGER_Member *member = value; | 47 | struct GNUNET_MESSENGER_Member *member = value; |
45 | destroy_member(member); | 48 | destroy_member(member); |
@@ -75,7 +78,8 @@ get_member_store_key (const struct GNUNET_MESSENGER_MemberStore *store) | |||
75 | } | 78 | } |
76 | 79 | ||
77 | static int | 80 | static int |
78 | callback_scan_for_members (void *cls, const char *filename) | 81 | callback_scan_for_members (void *cls, |
82 | const char *filename) | ||
79 | { | 83 | { |
80 | struct GNUNET_MESSENGER_MemberStore *store = cls; | 84 | struct GNUNET_MESSENGER_MemberStore *store = cls; |
81 | 85 | ||
@@ -94,7 +98,9 @@ callback_scan_for_members (void *cls, const char *filename) | |||
94 | } | 98 | } |
95 | 99 | ||
96 | static int | 100 | static int |
97 | iterate_load_next_member_sessions (void *cls, const struct GNUNET_ShortHashCode *id, void *value) | 101 | iterate_load_next_member_sessions (void *cls, |
102 | const struct GNUNET_ShortHashCode *id, | ||
103 | void *value) | ||
98 | { | 104 | { |
99 | const char *sync_dir = cls; | 105 | const char *sync_dir = cls; |
100 | 106 | ||
@@ -114,7 +120,9 @@ iterate_load_next_member_sessions (void *cls, const struct GNUNET_ShortHashCode | |||
114 | } | 120 | } |
115 | 121 | ||
116 | static int | 122 | static int |
117 | iterate_sync_member_contacts (void *cls, const struct GNUNET_ShortHashCode *id, void *value) | 123 | iterate_sync_member_contacts (void *cls, |
124 | const struct GNUNET_ShortHashCode *id, | ||
125 | void *value) | ||
118 | { | 126 | { |
119 | struct GNUNET_MESSENGER_Member *member = value; | 127 | struct GNUNET_MESSENGER_Member *member = value; |
120 | 128 | ||
@@ -126,7 +134,8 @@ iterate_sync_member_contacts (void *cls, const struct GNUNET_ShortHashCode *id, | |||
126 | } | 134 | } |
127 | 135 | ||
128 | void | 136 | void |
129 | load_member_store (struct GNUNET_MESSENGER_MemberStore *store, const char *directory) | 137 | load_member_store (struct GNUNET_MESSENGER_MemberStore *store, |
138 | const char *directory) | ||
130 | { | 139 | { |
131 | GNUNET_assert ((store) && (directory)); | 140 | GNUNET_assert ((store) && (directory)); |
132 | 141 | ||
@@ -143,7 +152,9 @@ load_member_store (struct GNUNET_MESSENGER_MemberStore *store, const char *direc | |||
143 | } | 152 | } |
144 | 153 | ||
145 | static int | 154 | static int |
146 | iterate_save_members (void *cls, const struct GNUNET_ShortHashCode *id, void *value) | 155 | iterate_save_members (void *cls, |
156 | const struct GNUNET_ShortHashCode *id, | ||
157 | void *value) | ||
147 | { | 158 | { |
148 | const char *save_dir = cls; | 159 | const char *save_dir = cls; |
149 | 160 | ||
@@ -164,7 +175,8 @@ iterate_save_members (void *cls, const struct GNUNET_ShortHashCode *id, void *va | |||
164 | } | 175 | } |
165 | 176 | ||
166 | void | 177 | void |
167 | save_member_store (struct GNUNET_MESSENGER_MemberStore *store, const char *directory) | 178 | save_member_store (struct GNUNET_MESSENGER_MemberStore *store, |
179 | const char *directory) | ||
168 | { | 180 | { |
169 | GNUNET_assert ((store) && (directory)); | 181 | GNUNET_assert ((store) && (directory)); |
170 | 182 | ||
@@ -179,7 +191,8 @@ save_member_store (struct GNUNET_MESSENGER_MemberStore *store, const char *direc | |||
179 | } | 191 | } |
180 | 192 | ||
181 | struct GNUNET_MESSENGER_Member* | 193 | struct GNUNET_MESSENGER_Member* |
182 | get_store_member (const struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_ShortHashCode *id) | 194 | get_store_member (const struct GNUNET_MESSENGER_MemberStore *store, |
195 | const struct GNUNET_ShortHashCode *id) | ||
183 | { | 196 | { |
184 | GNUNET_assert ((store) && (store->members) && (id)); | 197 | GNUNET_assert ((store) && (store->members) && (id)); |
185 | 198 | ||
@@ -187,7 +200,8 @@ get_store_member (const struct GNUNET_MESSENGER_MemberStore *store, const struct | |||
187 | } | 200 | } |
188 | 201 | ||
189 | struct GNUNET_MESSENGER_Member* | 202 | struct GNUNET_MESSENGER_Member* |
190 | get_store_member_of (struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_MESSENGER_Message *message) | 203 | get_store_member_of (struct GNUNET_MESSENGER_MemberStore *store, |
204 | const struct GNUNET_MESSENGER_Message *message) | ||
191 | { | 205 | { |
192 | if ((GNUNET_MESSENGER_KIND_INFO == message->header.kind) || | 206 | if ((GNUNET_MESSENGER_KIND_INFO == message->header.kind) || |
193 | (GNUNET_MESSENGER_KIND_JOIN == message->header.kind)) | 207 | (GNUNET_MESSENGER_KIND_JOIN == message->header.kind)) |
@@ -197,7 +211,8 @@ get_store_member_of (struct GNUNET_MESSENGER_MemberStore *store, const struct GN | |||
197 | } | 211 | } |
198 | 212 | ||
199 | struct GNUNET_MESSENGER_Member* | 213 | struct GNUNET_MESSENGER_Member* |
200 | add_store_member (struct GNUNET_MESSENGER_MemberStore *store, const struct GNUNET_ShortHashCode *id) | 214 | add_store_member (struct GNUNET_MESSENGER_MemberStore *store, |
215 | const struct GNUNET_ShortHashCode *id) | ||
201 | { | 216 | { |
202 | GNUNET_assert ((store) && (store->members)); | 217 | GNUNET_assert ((store) && (store->members)); |
203 | 218 | ||
@@ -227,7 +242,9 @@ struct GNUNET_MESSENGER_ClosureIterateMembers { | |||
227 | }; | 242 | }; |
228 | 243 | ||
229 | static int | 244 | static int |
230 | iterate_store_members_it (void *cls, const struct GNUNET_ShortHashCode *key, void *value) | 245 | iterate_store_members_it (void *cls, |
246 | const struct GNUNET_ShortHashCode *key, | ||
247 | void *value) | ||
231 | { | 248 | { |
232 | struct GNUNET_MESSENGER_ClosureIterateMembers *iterate = cls; | 249 | struct GNUNET_MESSENGER_ClosureIterateMembers *iterate = cls; |
233 | struct GNUNET_MESSENGER_Member *member = value; | 250 | struct GNUNET_MESSENGER_Member *member = value; |
@@ -236,7 +253,8 @@ iterate_store_members_it (void *cls, const struct GNUNET_ShortHashCode *key, voi | |||
236 | } | 253 | } |
237 | 254 | ||
238 | int | 255 | int |
239 | iterate_store_members (struct GNUNET_MESSENGER_MemberStore *store, GNUNET_MESSENGER_MemberIteratorCallback it, | 256 | iterate_store_members (struct GNUNET_MESSENGER_MemberStore *store, |
257 | GNUNET_MESSENGER_MemberIteratorCallback it, | ||
240 | void* cls) | 258 | void* cls) |
241 | { | 259 | { |
242 | GNUNET_assert ((store) && (store->members) && (it)); | 260 | GNUNET_assert ((store) && (store->members) && (it)); |