diff options
-rw-r--r-- | src/conversation/conversation.conf.in | 16 | ||||
-rw-r--r-- | src/include/gnunet_conversation_service.h | 1 | ||||
-rw-r--r-- | src/include/gnunet_dnsparser_lib.h | 20 | ||||
-rw-r--r-- | src/include/gnunet_gnsrecord_lib.h | 4 | ||||
-rw-r--r-- | src/include/gnunet_namestore_service.h | 22 |
5 files changed, 42 insertions, 21 deletions
diff --git a/src/conversation/conversation.conf.in b/src/conversation/conversation.conf.in index ca27b535a..fb0478f4e 100644 --- a/src/conversation/conversation.conf.in +++ b/src/conversation/conversation.conf.in | |||
@@ -4,8 +4,24 @@ BINARY = gnunet-service-conversation | |||
4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock | 4 | UNIXPATH = $GNUNET_RUNTIME_DIR/gnunet-service-conversation.sock |
5 | HOSTNAME = localhost | 5 | HOSTNAME = localhost |
6 | @UNIXONLY@ PORT = 2106 | 6 | @UNIXONLY@ PORT = 2106 |
7 | |||
8 | # Desired phone line. Change if multiple users are using | ||
9 | # the same peer and we thus need disjoint phone lines. | ||
7 | LINE = 1 | 10 | LINE = 1 |
8 | 11 | ||
12 | # Should the phone record be private? (only set to YES if | ||
13 | # you really know what you are doing, you will then likely | ||
14 | # not be able to receive calls). | ||
15 | RECORD_IS_PRIVATE = NO | ||
16 | |||
17 | # How long should phone records remain published in GNS? | ||
18 | # A long expiration time has the advantage that the phone | ||
19 | # is more likely found and/or resolved faster, OTOH it | ||
20 | # then takes longer to change the phone line if necessary. | ||
21 | # The default should be fine for most users. | ||
22 | RECORD_EXPIRATION = 1 day | ||
23 | |||
24 | |||
9 | ACCEPT_FROM = 127.0.0.1; | 25 | ACCEPT_FROM = 127.0.0.1; |
10 | ACCEPT_FROM6 = ::1; | 26 | ACCEPT_FROM6 = ::1; |
11 | UNIX_MATCH_UID = NO | 27 | UNIX_MATCH_UID = NO |
diff --git a/src/include/gnunet_conversation_service.h b/src/include/gnunet_conversation_service.h index c610dd0bd..bbeae807c 100644 --- a/src/include/gnunet_conversation_service.h +++ b/src/include/gnunet_conversation_service.h | |||
@@ -368,6 +368,7 @@ typedef void (*GNUNET_CONVERSATION_CallEventHandler)(void *cls, | |||
368 | * #GNUNET_CONVERSATION_EC_CALL_PICKED_UP event is generated) | 368 | * #GNUNET_CONVERSATION_EC_CALL_PICKED_UP event is generated) |
369 | * @param event_handler how to notify the owner of the phone about events | 369 | * @param event_handler how to notify the owner of the phone about events |
370 | * @param event_handler_cls closure for @a event_handler | 370 | * @param event_handler_cls closure for @a event_handler |
371 | * @return handle for the call | ||
371 | */ | 372 | */ |
372 | struct GNUNET_CONVERSATION_Call * | 373 | struct GNUNET_CONVERSATION_Call * |
373 | GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg, | 374 | GNUNET_CONVERSATION_call_start (const struct GNUNET_CONFIGURATION_Handle *cfg, |
diff --git a/src/include/gnunet_dnsparser_lib.h b/src/include/gnunet_dnsparser_lib.h index a31f87af8..6dc75b9a4 100644 --- a/src/include/gnunet_dnsparser_lib.h +++ b/src/include/gnunet_dnsparser_lib.h | |||
@@ -66,7 +66,7 @@ struct GNUNET_DNSPARSER_Query | |||
66 | /** | 66 | /** |
67 | * Name of the record that the query is for (0-terminated). | 67 | * Name of the record that the query is for (0-terminated). |
68 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 68 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
69 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 69 | * as necessary. Use #GNUNET_DNSPARSER_check_label() to test if an |
70 | * individual label is well-formed. If a given name is not well-formed, | 70 | * individual label is well-formed. If a given name is not well-formed, |
71 | * creating the DNS packet will fail. | 71 | * creating the DNS packet will fail. |
72 | */ | 72 | */ |
@@ -99,7 +99,7 @@ struct GNUNET_DNSPARSER_MxRecord | |||
99 | /** | 99 | /** |
100 | * Name of the mail server. | 100 | * Name of the mail server. |
101 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 101 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
102 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 102 | * as necessary. Use #GNUNET_DNSPARSER_check_label() to test if an |
103 | * individual label is well-formed. If a given name is not well-formed, | 103 | * individual label is well-formed. If a given name is not well-formed, |
104 | * creating the DNS packet will fail. | 104 | * creating the DNS packet will fail. |
105 | */ | 105 | */ |
@@ -112,7 +112,7 @@ struct GNUNET_DNSPARSER_MxRecord | |||
112 | * Information from SRV records (RFC 2782). The 'service', 'proto' | 112 | * Information from SRV records (RFC 2782). The 'service', 'proto' |
113 | * and 'domain_name' fields together give the DNS-name which for SRV | 113 | * and 'domain_name' fields together give the DNS-name which for SRV |
114 | * records is of the form "_$SERVICE._$PROTO.$DOMAIN_NAME". The DNS | 114 | * records is of the form "_$SERVICE._$PROTO.$DOMAIN_NAME". The DNS |
115 | * parser provides the full name in 'struct DNSPARSER_Record' and the | 115 | * parser provides the full name in `struct DNSPARSER_Record` and the |
116 | * individual components in the respective fields of this struct. | 116 | * individual components in the respective fields of this struct. |
117 | * When serializing, you CAN set the 'name' field of 'struct | 117 | * When serializing, you CAN set the 'name' field of 'struct |
118 | * GNUNET_DNSPARSER_Record' to NULL, in which case the DNSPARSER code | 118 | * GNUNET_DNSPARSER_Record' to NULL, in which case the DNSPARSER code |
@@ -126,7 +126,7 @@ struct GNUNET_DNSPARSER_SrvRecord | |||
126 | * Service name without the underscore (!). Note that RFC 6335 clarifies the | 126 | * Service name without the underscore (!). Note that RFC 6335 clarifies the |
127 | * set of legal characters for service names. | 127 | * set of legal characters for service names. |
128 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 128 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
129 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 129 | * as necessary. Use #GNUNET_DNSPARSER_check_label() to test if an |
130 | * individual label is well-formed. If a given name is not well-formed, | 130 | * individual label is well-formed. If a given name is not well-formed, |
131 | * creating the DNS packet will fail. | 131 | * creating the DNS packet will fail. |
132 | */ | 132 | */ |
@@ -141,7 +141,7 @@ struct GNUNET_DNSPARSER_SrvRecord | |||
141 | /** | 141 | /** |
142 | * Domain name for which the record is valid | 142 | * Domain name for which the record is valid |
143 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 143 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
144 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 144 | * as necessary. Use #GNUNET_DNSPARSER_check_label() to test if an |
145 | * individual label is well-formed. If a given name is not well-formed, | 145 | * individual label is well-formed. If a given name is not well-formed, |
146 | * creating the DNS packet will fail. | 146 | * creating the DNS packet will fail. |
147 | */ | 147 | */ |
@@ -150,7 +150,7 @@ struct GNUNET_DNSPARSER_SrvRecord | |||
150 | /** | 150 | /** |
151 | * Hostname offering the service. | 151 | * Hostname offering the service. |
152 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 152 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
153 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 153 | * as necessary. Use #GNUNET_DNSPARSER_check_label() to test if an |
154 | * individual label is well-formed. If a given name is not well-formed, | 154 | * individual label is well-formed. If a given name is not well-formed, |
155 | * creating the DNS packet will fail. | 155 | * creating the DNS packet will fail. |
156 | */ | 156 | */ |
@@ -353,7 +353,7 @@ struct GNUNET_DNSPARSER_SoaRecord | |||
353 | * The domainname of the name server that was the | 353 | * The domainname of the name server that was the |
354 | * original or primary source of data for this zone. | 354 | * original or primary source of data for this zone. |
355 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 355 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
356 | * as necessary. Use #GNUNET_DNSPARSER_check_label to test if an | 356 | * as necessary. Use #GNUNET_DNSPARSER_check_label() to test if an |
357 | * individual label is well-formed. If a given name is not well-formed, | 357 | * individual label is well-formed. If a given name is not well-formed, |
358 | * creating the DNS packet will fail. | 358 | * creating the DNS packet will fail. |
359 | */ | 359 | */ |
@@ -363,7 +363,7 @@ struct GNUNET_DNSPARSER_SoaRecord | |||
363 | * A domainname which specifies the mailbox of the | 363 | * A domainname which specifies the mailbox of the |
364 | * person responsible for this zone. | 364 | * person responsible for this zone. |
365 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 365 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
366 | * as necessary. Use 'GNUNET_DNSPARSER_check_label' to test if an | 366 | * as necessary. Use #GNUNET_DNSPARSER_check_label() to test if an |
367 | * individual label is well-formed. If a given name is not well-formed, | 367 | * individual label is well-formed. If a given name is not well-formed, |
368 | * creating the DNS packet will fail. | 368 | * creating the DNS packet will fail. |
369 | */ | 369 | */ |
@@ -427,7 +427,7 @@ struct GNUNET_DNSPARSER_Record | |||
427 | /** | 427 | /** |
428 | * Name of the record that the query is for (0-terminated). | 428 | * Name of the record that the query is for (0-terminated). |
429 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 429 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
430 | * as necessary. Use #GNUNET_DNSPARSER_check_label to test if an | 430 | * as necessary. Use #GNUNET_DNSPARSER_check_label() to test if an |
431 | * individual label is well-formed. If a given name is not well-formed, | 431 | * individual label is well-formed. If a given name is not well-formed, |
432 | * creating the DNS packet will fail. | 432 | * creating the DNS packet will fail. |
433 | */ | 433 | */ |
@@ -442,7 +442,7 @@ struct GNUNET_DNSPARSER_Record | |||
442 | /** | 442 | /** |
443 | * For NS, CNAME and PTR records, this is the uncompressed 0-terminated hostname. | 443 | * For NS, CNAME and PTR records, this is the uncompressed 0-terminated hostname. |
444 | * In UTF-8 format. The library will convert from and to DNS-IDNA | 444 | * In UTF-8 format. The library will convert from and to DNS-IDNA |
445 | * as necessary. Use #GNUNET_DNSPARSER_check_label to test if an | 445 | * as necessary. Use #GNUNET_DNSPARSER_check_label() to test if an |
446 | * individual label is well-formed. If a given name is not well-formed, | 446 | * individual label is well-formed. If a given name is not well-formed, |
447 | * creating the DNS packet will fail. | 447 | * creating the DNS packet will fail. |
448 | */ | 448 | */ |
diff --git a/src/include/gnunet_gnsrecord_lib.h b/src/include/gnunet_gnsrecord_lib.h index 04a772c10..bc0a90cc2 100644 --- a/src/include/gnunet_gnsrecord_lib.h +++ b/src/include/gnunet_gnsrecord_lib.h | |||
@@ -146,13 +146,13 @@ struct GNUNET_GNSRECORD_Data | |||
146 | 146 | ||
147 | /** | 147 | /** |
148 | * Expiration time for the DNS record. Can be relative | 148 | * Expiration time for the DNS record. Can be relative |
149 | * or absolute, depending on 'flags'. Measured in the same | 149 | * or absolute, depending on @e flags. Measured in the same |
150 | * unit as GNUnet time (microseconds). | 150 | * unit as GNUnet time (microseconds). |
151 | */ | 151 | */ |
152 | uint64_t expiration_time; | 152 | uint64_t expiration_time; |
153 | 153 | ||
154 | /** | 154 | /** |
155 | * Number of bytes in 'data'. | 155 | * Number of bytes in @e data. |
156 | */ | 156 | */ |
157 | size_t data_size; | 157 | size_t data_size; |
158 | 158 | ||
diff --git a/src/include/gnunet_namestore_service.h b/src/include/gnunet_namestore_service.h index 8466d6135..19c57c718 100644 --- a/src/include/gnunet_namestore_service.h +++ b/src/include/gnunet_namestore_service.h | |||
@@ -89,9 +89,10 @@ GNUNET_NAMESTORE_disconnect (struct GNUNET_NAMESTORE_Handle *h); | |||
89 | * #GNUNET_YES (or other positive value) on success | 89 | * #GNUNET_YES (or other positive value) on success |
90 | * @param emsg NULL on success, otherwise an error message | 90 | * @param emsg NULL on success, otherwise an error message |
91 | */ | 91 | */ |
92 | typedef void (*GNUNET_NAMESTORE_ContinuationWithStatus) (void *cls, | 92 | typedef void |
93 | int32_t success, | 93 | (*GNUNET_NAMESTORE_ContinuationWithStatus) (void *cls, |
94 | const char *emsg); | 94 | int32_t success, |
95 | const char *emsg); | ||
95 | 96 | ||
96 | 97 | ||
97 | /** | 98 | /** |
@@ -128,11 +129,13 @@ GNUNET_NAMESTORE_records_store (struct GNUNET_NAMESTORE_Handle *h, | |||
128 | * @param rd_count number of entries in @a rd array, 0 if label was deleted | 129 | * @param rd_count number of entries in @a rd array, 0 if label was deleted |
129 | * @param rd array of records with data to store | 130 | * @param rd array of records with data to store |
130 | */ | 131 | */ |
131 | typedef void (*GNUNET_NAMESTORE_RecordMonitor) (void *cls, | 132 | typedef void |
132 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, | 133 | (*GNUNET_NAMESTORE_RecordMonitor) (void *cls, |
133 | const char *label, | 134 | const struct GNUNET_CRYPTO_EcdsaPrivateKey *zone, |
134 | unsigned int rd_count, | 135 | const char *label, |
135 | const struct GNUNET_GNSRECORD_Data *rd); | 136 | unsigned int rd_count, |
137 | const struct GNUNET_GNSRECORD_Data *rd); | ||
138 | |||
136 | 139 | ||
137 | /** | 140 | /** |
138 | * Set the desired nick name for a zone | 141 | * Set the desired nick name for a zone |
@@ -259,7 +262,8 @@ struct GNUNET_NAMESTORE_ZoneMonitor; | |||
259 | * | 262 | * |
260 | * @param cls closure | 263 | * @param cls closure |
261 | */ | 264 | */ |
262 | typedef void (*GNUNET_NAMESTORE_RecordsSynchronizedCallback)(void *cls); | 265 | typedef void |
266 | (*GNUNET_NAMESTORE_RecordsSynchronizedCallback)(void *cls); | ||
263 | 267 | ||
264 | 268 | ||
265 | /** | 269 | /** |