diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/identity/gnunet-service-identity.c | 7 | ||||
-rw-r--r-- | src/identity/identity.conf.in | 2 | ||||
-rw-r--r-- | src/identity/identity_api.c | 1 | ||||
-rw-r--r-- | src/identity/test_identity.c | 16 | ||||
-rw-r--r-- | src/include/gnunet_identity_service.h | 2 |
5 files changed, 18 insertions, 10 deletions
diff --git a/src/identity/gnunet-service-identity.c b/src/identity/gnunet-service-identity.c index 84da12c2a..ec874fa6f 100644 --- a/src/identity/gnunet-service-identity.c +++ b/src/identity/gnunet-service-identity.c | |||
@@ -916,6 +916,13 @@ run (void *cls, | |||
916 | stats = GNUNET_STATISTICS_create ("identity", cfg); | 916 | stats = GNUNET_STATISTICS_create ("identity", cfg); |
917 | GNUNET_SERVER_add_handlers (server, handlers); | 917 | GNUNET_SERVER_add_handlers (server, handlers); |
918 | nc = GNUNET_SERVER_notification_context_create (server, 1); | 918 | nc = GNUNET_SERVER_notification_context_create (server, 1); |
919 | if (GNUNET_OK != | ||
920 | GNUNET_DISK_directory_create (ego_directory)) | ||
921 | { | ||
922 | GNUNET_log (GNUNET_ERROR_TYPE_ERROR, | ||
923 | _("Failed to create directory `%s' for storing egos\n"), | ||
924 | ego_directory); | ||
925 | } | ||
919 | GNUNET_DISK_directory_scan (ego_directory, | 926 | GNUNET_DISK_directory_scan (ego_directory, |
920 | &process_ego_file, | 927 | &process_ego_file, |
921 | NULL); | 928 | NULL); |
diff --git a/src/identity/identity.conf.in b/src/identity/identity.conf.in index 737614119..671e5f2f1 100644 --- a/src/identity/identity.conf.in +++ b/src/identity/identity.conf.in | |||
@@ -13,3 +13,5 @@ UNIX_MATCH_GID = YES | |||
13 | # Directory where we store information about our egos | 13 | # Directory where we store information about our egos |
14 | EGODIR = $SERVICEHOME/egos/ | 14 | EGODIR = $SERVICEHOME/egos/ |
15 | 15 | ||
16 | # File where we store default identities for subsystems | ||
17 | SUBSYSTEM_CFG = $SERVICEHOME/subsystem_defaults.conf | ||
diff --git a/src/identity/identity_api.c b/src/identity/identity_api.c index 441b63bf0..15a454e60 100644 --- a/src/identity/identity_api.c +++ b/src/identity/identity_api.c | |||
@@ -910,6 +910,7 @@ void | |||
910 | GNUNET_IDENTITY_disconnect (struct GNUNET_IDENTITY_Handle *h) | 910 | GNUNET_IDENTITY_disconnect (struct GNUNET_IDENTITY_Handle *h) |
911 | { | 911 | { |
912 | GNUNET_assert (NULL != h); | 912 | GNUNET_assert (NULL != h); |
913 | GNUNET_assert (h->op_head == h->op_tail); | ||
913 | if (h->reconnect_task != GNUNET_SCHEDULER_NO_TASK) | 914 | if (h->reconnect_task != GNUNET_SCHEDULER_NO_TASK) |
914 | { | 915 | { |
915 | GNUNET_SCHEDULER_cancel (h->reconnect_task); | 916 | GNUNET_SCHEDULER_cancel (h->reconnect_task); |
diff --git a/src/identity/test_identity.c b/src/identity/test_identity.c index 4677949f9..02bf341e8 100644 --- a/src/identity/test_identity.c +++ b/src/identity/test_identity.c | |||
@@ -60,16 +60,16 @@ static GNUNET_SCHEDULER_TaskIdentifier endbadly_task; | |||
60 | static void | 60 | static void |
61 | cleanup () | 61 | cleanup () |
62 | { | 62 | { |
63 | if (NULL != h) | ||
64 | { | ||
65 | GNUNET_IDENTITY_disconnect (h); | ||
66 | h = NULL; | ||
67 | } | ||
68 | if (NULL != op) | 63 | if (NULL != op) |
69 | { | 64 | { |
70 | GNUNET_IDENTITY_cancel (op); | 65 | GNUNET_IDENTITY_cancel (op); |
71 | op = NULL; | 66 | op = NULL; |
72 | } | 67 | } |
68 | if (NULL != h) | ||
69 | { | ||
70 | GNUNET_IDENTITY_disconnect (h); | ||
71 | h = NULL; | ||
72 | } | ||
73 | GNUNET_SCHEDULER_shutdown (); | 73 | GNUNET_SCHEDULER_shutdown (); |
74 | } | 74 | } |
75 | 75 | ||
@@ -113,7 +113,7 @@ end () | |||
113 | GNUNET_SCHEDULER_cancel (endbadly_task); | 113 | GNUNET_SCHEDULER_cancel (endbadly_task); |
114 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; | 114 | endbadly_task = GNUNET_SCHEDULER_NO_TASK; |
115 | } | 115 | } |
116 | GNUNET_SCHEDULER_add_now (&end, NULL); | 116 | GNUNET_SCHEDULER_add_now (&end_normally, NULL); |
117 | } | 117 | } |
118 | 118 | ||
119 | 119 | ||
@@ -155,11 +155,11 @@ create_cb (void *cls, | |||
155 | const char *identifier) | 155 | const char *identifier) |
156 | { | 156 | { |
157 | op = NULL; | 157 | op = NULL; |
158 | fprintf (stderr, "HERE!\n"); | ||
158 | end (); /* yepee */ | 159 | end (); /* yepee */ |
159 | } | 160 | } |
160 | 161 | ||
161 | 162 | ||
162 | |||
163 | /** | 163 | /** |
164 | * Main function of the test, run from scheduler. | 164 | * Main function of the test, run from scheduler. |
165 | * | 165 | * |
@@ -184,8 +184,6 @@ run (void *cls, | |||
184 | } | 184 | } |
185 | 185 | ||
186 | 186 | ||
187 | |||
188 | |||
189 | int | 187 | int |
190 | main (int argc, char *argv[]) | 188 | main (int argc, char *argv[]) |
191 | { | 189 | { |
diff --git a/src/include/gnunet_identity_service.h b/src/include/gnunet_identity_service.h index e0d528d9d..2edd3bfdf 100644 --- a/src/include/gnunet_identity_service.h +++ b/src/include/gnunet_identity_service.h | |||
@@ -246,7 +246,7 @@ GNUNET_IDENTITY_delete (struct GNUNET_IDENTITY_Handle *id, | |||
246 | * @param op operation to cancel | 246 | * @param op operation to cancel |
247 | */ | 247 | */ |
248 | void | 248 | void |
249 | GNUNET_IDENITY_cancel (struct GNUNET_IDENTITY_Operation *op); | 249 | GNUNET_IDENTITY_cancel (struct GNUNET_IDENTITY_Operation *op); |
250 | 250 | ||
251 | 251 | ||
252 | #if 0 /* keep Emacsens' auto-indent happy */ | 252 | #if 0 /* keep Emacsens' auto-indent happy */ |