aboutsummaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
Diffstat (limited to 'src/include')
-rw-r--r--src/include/gnunet_ats_service.h17
-rw-r--r--src/include/gnunet_fs_service.h4
-rw-r--r--src/include/gnunet_hello_lib.h22
-rw-r--r--src/include/gnunet_os_lib.h10
-rw-r--r--src/include/gnunet_transport_service.h45
-rw-r--r--src/include/winproc.h20
6 files changed, 65 insertions, 53 deletions
diff --git a/src/include/gnunet_ats_service.h b/src/include/gnunet_ats_service.h
index 8c9be13d4..ecbdd2f70 100644
--- a/src/include/gnunet_ats_service.h
+++ b/src/include/gnunet_ats_service.h
@@ -448,7 +448,9 @@ struct Session;
448 * @param ats_count number of performance records in 'ats' 448 * @param ats_count number of performance records in 'ats'
449 */ 449 */
450typedef void (*GNUNET_ATS_AddressSuggestionCallback) (void *cls, 450typedef void (*GNUNET_ATS_AddressSuggestionCallback) (void *cls,
451 const struct GNUNET_HELLO_Address *address, 451 const struct
452 GNUNET_HELLO_Address *
453 address,
452 struct Session * session, 454 struct Session * session,
453 struct 455 struct
454 GNUNET_BANDWIDTH_Value32NBO 456 GNUNET_BANDWIDTH_Value32NBO
@@ -504,7 +506,7 @@ GNUNET_ATS_suggest_address (struct GNUNET_ATS_SchedulingHandle *sh,
504 */ 506 */
505void 507void
506GNUNET_ATS_suggest_address_cancel (struct GNUNET_ATS_SchedulingHandle *sh, 508GNUNET_ATS_suggest_address_cancel (struct GNUNET_ATS_SchedulingHandle *sh,
507 const struct GNUNET_PeerIdentity *peer); 509 const struct GNUNET_PeerIdentity *peer);
508 510
509/** 511/**
510 * We have updated performance statistics for a given address. Note 512 * We have updated performance statistics for a given address. Note
@@ -522,7 +524,7 @@ GNUNET_ATS_suggest_address_cancel (struct GNUNET_ATS_SchedulingHandle *sh,
522 */ 524 */
523void 525void
524GNUNET_ATS_address_update (struct GNUNET_ATS_SchedulingHandle *sh, 526GNUNET_ATS_address_update (struct GNUNET_ATS_SchedulingHandle *sh,
525 const struct GNUNET_HELLO_Address *address, 527 const struct GNUNET_HELLO_Address *address,
526 struct Session *session, 528 struct Session *session,
527 const struct GNUNET_ATS_Information *ats, 529 const struct GNUNET_ATS_Information *ats,
528 uint32_t ats_count); 530 uint32_t ats_count);
@@ -540,8 +542,7 @@ GNUNET_ATS_address_update (struct GNUNET_ATS_SchedulingHandle *sh,
540void 542void
541GNUNET_ATS_address_in_use (struct GNUNET_ATS_SchedulingHandle *sh, 543GNUNET_ATS_address_in_use (struct GNUNET_ATS_SchedulingHandle *sh,
542 const struct GNUNET_HELLO_Address *address, 544 const struct GNUNET_HELLO_Address *address,
543 struct Session *session, 545 struct Session *session, int in_use);
544 int in_use);
545 546
546/** 547/**
547 * A session got destroyed, stop including it as a valid address. 548 * A session got destroyed, stop including it as a valid address.
@@ -553,7 +554,7 @@ GNUNET_ATS_address_in_use (struct GNUNET_ATS_SchedulingHandle *sh,
553void 554void
554GNUNET_ATS_address_destroyed (struct GNUNET_ATS_SchedulingHandle *sh, 555GNUNET_ATS_address_destroyed (struct GNUNET_ATS_SchedulingHandle *sh,
555 const struct GNUNET_HELLO_Address *address, 556 const struct GNUNET_HELLO_Address *address,
556 struct Session *session); 557 struct Session *session);
557 558
558 559
559/* ******************************** Performance API ***************************** */ 560/* ******************************** Performance API ***************************** */
@@ -575,7 +576,9 @@ struct GNUNET_ATS_PerformanceHandle;
575 * @param ats_count number of performance records in 'ats' 576 * @param ats_count number of performance records in 'ats'
576 */ 577 */
577typedef void (*GNUNET_ATS_PeerInformationCallback) (void *cls, 578typedef void (*GNUNET_ATS_PeerInformationCallback) (void *cls,
578 const struct GNUNET_HELLO_Address *address, 579 const struct
580 GNUNET_HELLO_Address *
581 address,
579 struct 582 struct
580 GNUNET_BANDWIDTH_Value32NBO 583 GNUNET_BANDWIDTH_Value32NBO
581 bandwidth_out, 584 bandwidth_out,
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h
index f4a71dd46..69918c8df 100644
--- a/src/include/gnunet_fs_service.h
+++ b/src/include/gnunet_fs_service.h
@@ -1036,10 +1036,10 @@ struct GNUNET_FS_ProgressInfo
1036 */ 1036 */
1037 unsigned int depth; 1037 unsigned int depth;
1038 1038
1039 /** 1039 /**
1040 * How much trust did we offer for downloading this block? 1040 * How much trust did we offer for downloading this block?
1041 */ 1041 */
1042 unsigned int trust_offered; 1042 unsigned int trust_offered;
1043 1043
1044 } progress; 1044 } progress;
1045 1045
diff --git a/src/include/gnunet_hello_lib.h b/src/include/gnunet_hello_lib.h
index 09f5f1c7d..ffddb0ba2 100644
--- a/src/include/gnunet_hello_lib.h
+++ b/src/include/gnunet_hello_lib.h
@@ -50,7 +50,7 @@ struct GNUNET_HELLO_Address
50 50
51 /** 51 /**
52 * For which peer is this an address? 52 * For which peer is this an address?
53 */ 53 */
54 struct GNUNET_PeerIdentity peer; 54 struct GNUNET_PeerIdentity peer;
55 55
56 /** 56 /**
@@ -83,9 +83,8 @@ struct GNUNET_HELLO_Address
83 */ 83 */
84struct GNUNET_HELLO_Address * 84struct GNUNET_HELLO_Address *
85GNUNET_HELLO_address_allocate (const struct GNUNET_PeerIdentity *peer, 85GNUNET_HELLO_address_allocate (const struct GNUNET_PeerIdentity *peer,
86 const char *transport_name, 86 const char *transport_name, const void *address,
87 const void *address, 87 size_t address_length);
88 size_t address_length);
89 88
90 89
91/** 90/**
@@ -108,7 +107,7 @@ GNUNET_HELLO_address_copy (const struct GNUNET_HELLO_Address *address);
108 */ 107 */
109int 108int
110GNUNET_HELLO_address_cmp (const struct GNUNET_HELLO_Address *a1, 109GNUNET_HELLO_address_cmp (const struct GNUNET_HELLO_Address *a1,
111 const struct GNUNET_HELLO_Address *a2); 110 const struct GNUNET_HELLO_Address *a2);
112 111
113 112
114/** 113/**
@@ -122,7 +121,7 @@ GNUNET_HELLO_address_get_size (const struct GNUNET_HELLO_Address *address);
122 121
123/** 122/**
124 * Free an address. 123 * Free an address.
125 * 124 *
126 * @param addr address to free 125 * @param addr address to free
127 */ 126 */
128#define GNUNET_HELLO_address_free(addr) GNUNET_free(addr) 127#define GNUNET_HELLO_address_free(addr) GNUNET_free(addr)
@@ -150,8 +149,7 @@ struct GNUNET_HELLO_Message;
150 */ 149 */
151size_t 150size_t
152GNUNET_HELLO_add_address (const struct GNUNET_HELLO_Address *address, 151GNUNET_HELLO_add_address (const struct GNUNET_HELLO_Address *address,
153 struct GNUNET_TIME_Absolute expiration, 152 struct GNUNET_TIME_Absolute expiration, char *target,
154 char *target,
155 size_t max); 153 size_t max);
156 154
157 155
@@ -240,9 +238,11 @@ GNUNET_HELLO_equals (const struct GNUNET_HELLO_Message *h1,
240 * GNUNET_NO to delete it from the HELLO 238 * GNUNET_NO to delete it from the HELLO
241 * GNUNET_SYSERR to stop iterating (but keep current address) 239 * GNUNET_SYSERR to stop iterating (but keep current address)
242 */ 240 */
243typedef int (*GNUNET_HELLO_AddressIterator) (void *cls, 241typedef int (*GNUNET_HELLO_AddressIterator) (void *cls,
244 const struct GNUNET_HELLO_Address *address, 242 const struct GNUNET_HELLO_Address *
245 struct GNUNET_TIME_Absolute expiration); 243 address,
244 struct GNUNET_TIME_Absolute
245 expiration);
246 246
247 247
248/** 248/**
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h
index 12ec3a54e..aed5e3b01 100644
--- a/src/include/gnunet_os_lib.h
+++ b/src/include/gnunet_os_lib.h
@@ -153,10 +153,12 @@ GNUNET_OS_installation_get_path (enum GNUNET_OS_InstallationPathKind dirkind);
153 */ 153 */
154typedef int (*GNUNET_OS_NetworkInterfaceProcessor) (void *cls, const char *name, 154typedef int (*GNUNET_OS_NetworkInterfaceProcessor) (void *cls, const char *name,
155 int isDefault, 155 int isDefault,
156 const struct sockaddr * addr, 156 const struct sockaddr *
157 const struct sockaddr * broadcast_addr, 157 addr,
158 const struct sockaddr * netmask, 158 const struct sockaddr *
159 socklen_t addrlen); 159 broadcast_addr,
160 const struct sockaddr *
161 netmask, socklen_t addrlen);
160 162
161 163
162/** 164/**
diff --git a/src/include/gnunet_transport_service.h b/src/include/gnunet_transport_service.h
index 24fa124f0..996712730 100644
--- a/src/include/gnunet_transport_service.h
+++ b/src/include/gnunet_transport_service.h
@@ -109,7 +109,7 @@ typedef void (*GNUNET_TRANSPORT_NotifyDisconnect) (void *cls,
109 * otherwise 0-terminated printable UTF-8 string 109 * otherwise 0-terminated printable UTF-8 string
110 */ 110 */
111typedef void (*GNUNET_TRANSPORT_AddressToStringCallback) (void *cls, 111typedef void (*GNUNET_TRANSPORT_AddressToStringCallback) (void *cls,
112 const char *address); 112 const char *address);
113 113
114 114
115/** 115/**
@@ -120,8 +120,12 @@ typedef void (*GNUNET_TRANSPORT_AddressToStringCallback) (void *cls,
120 * @param address address, NULL for disconnect notification in monitor mode 120 * @param address address, NULL for disconnect notification in monitor mode
121 */ 121 */
122typedef void (*GNUNET_TRANSPORT_PeerIterateCallback) (void *cls, 122typedef void (*GNUNET_TRANSPORT_PeerIterateCallback) (void *cls,
123 const struct GNUNET_PeerIdentity *peer, 123 const struct
124 const struct GNUNET_HELLO_Address *address); 124 GNUNET_PeerIdentity *
125 peer,
126 const struct
127 GNUNET_HELLO_Address *
128 address);
125 129
126 130
127/** 131/**
@@ -291,12 +295,13 @@ struct GNUNET_TRANSPORT_AddressToStringContext;
291 * @return handle to cancel the operation, NULL on error 295 * @return handle to cancel the operation, NULL on error
292 */ 296 */
293struct GNUNET_TRANSPORT_AddressToStringContext * 297struct GNUNET_TRANSPORT_AddressToStringContext *
294GNUNET_TRANSPORT_address_to_string (const struct GNUNET_CONFIGURATION_Handle *cfg, 298GNUNET_TRANSPORT_address_to_string (const struct GNUNET_CONFIGURATION_Handle
295 const struct GNUNET_HELLO_Address *address, 299 *cfg,
296 int numeric, 300 const struct GNUNET_HELLO_Address *address,
297 struct GNUNET_TIME_Relative timeout, 301 int numeric,
298 GNUNET_TRANSPORT_AddressToStringCallback aluc, 302 struct GNUNET_TIME_Relative timeout,
299 void *aluc_cls); 303 GNUNET_TRANSPORT_AddressToStringCallback
304 aluc, void *aluc_cls);
300 305
301 306
302/** 307/**
@@ -306,8 +311,8 @@ GNUNET_TRANSPORT_address_to_string (const struct GNUNET_CONFIGURATION_Handle *cf
306 */ 311 */
307void 312void
308GNUNET_TRANSPORT_address_to_string_cancel (struct 313GNUNET_TRANSPORT_address_to_string_cancel (struct
309 GNUNET_TRANSPORT_AddressToStringContext 314 GNUNET_TRANSPORT_AddressToStringContext
310 *alc); 315 *alc);
311 316
312 317
313/** 318/**
@@ -328,12 +333,14 @@ GNUNET_TRANSPORT_address_to_string_cancel (struct
328 * @param peer_address_callback_cls closure for peer_address_callback 333 * @param peer_address_callback_cls closure for peer_address_callback
329 */ 334 */
330struct GNUNET_TRANSPORT_PeerIterateContext * 335struct GNUNET_TRANSPORT_PeerIterateContext *
331GNUNET_TRANSPORT_peer_get_active_addresses (const struct GNUNET_CONFIGURATION_Handle *cfg, 336GNUNET_TRANSPORT_peer_get_active_addresses (const struct
332 const struct GNUNET_PeerIdentity *peer, 337 GNUNET_CONFIGURATION_Handle *cfg,
333 int one_shot, 338 const struct GNUNET_PeerIdentity
334 struct GNUNET_TIME_Relative timeout, 339 *peer, int one_shot,
335 GNUNET_TRANSPORT_PeerIterateCallback peer_address_callback, 340 struct GNUNET_TIME_Relative timeout,
336 void *peer_address_callback_cls); 341 GNUNET_TRANSPORT_PeerIterateCallback
342 peer_address_callback,
343 void *peer_address_callback_cls);
337 344
338 345
339/** 346/**
@@ -343,8 +350,8 @@ GNUNET_TRANSPORT_peer_get_active_addresses (const struct GNUNET_CONFIGURATION_Ha
343 */ 350 */
344void 351void
345GNUNET_TRANSPORT_peer_get_active_addresses_cancel (struct 352GNUNET_TRANSPORT_peer_get_active_addresses_cancel (struct
346 GNUNET_TRANSPORT_PeerIterateContext 353 GNUNET_TRANSPORT_PeerIterateContext
347*alc); 354 *alc);
348 355
349 356
350/** 357/**
diff --git a/src/include/winproc.h b/src/include/winproc.h
index ac4eecdfb..74e41edc9 100644
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -208,16 +208,16 @@ extern "C"
208#define ENUMNICS3_MASK_OK 0x01 208#define ENUMNICS3_MASK_OK 0x01
209#define ENUMNICS3_BCAST_OK 0x02 209#define ENUMNICS3_BCAST_OK 0x02
210 210
211struct EnumNICs3_results 211 struct EnumNICs3_results
212{ 212 {
213 unsigned char flags; 213 unsigned char flags;
214 int is_default; 214 int is_default;
215 char pretty_name[1001]; 215 char pretty_name[1001];
216 size_t addr_size; 216 size_t addr_size;
217 struct sockaddr address; 217 struct sockaddr address;
218 struct sockaddr mask; 218 struct sockaddr mask;
219 struct sockaddr broadcast; 219 struct sockaddr broadcast;
220}; 220 };
221 221
222 int EnumNICs3 (struct EnumNICs3_results **, int *EnumNICs3_results_count); 222 int EnumNICs3 (struct EnumNICs3_results **, int *EnumNICs3_results_count);
223 void EnumNICs3_free (struct EnumNICs3_results *); 223 void EnumNICs3_free (struct EnumNICs3_results *);
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 03:32:24 +0000