diff options
Diffstat (limited to 'src/include/gnunet_os_lib.h')
-rw-r--r-- | src/include/gnunet_os_lib.h | 36 |
1 files changed, 21 insertions, 15 deletions
diff --git a/src/include/gnunet_os_lib.h b/src/include/gnunet_os_lib.h index eddf97dab..c1e193720 100644 --- a/src/include/gnunet_os_lib.h +++ b/src/include/gnunet_os_lib.h | |||
@@ -18,7 +18,15 @@ | |||
18 | SPDX-License-Identifier: AGPL3.0-or-later | 18 | SPDX-License-Identifier: AGPL3.0-or-later |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #if ! defined (__GNUNET_UTIL_LIB_H_INSIDE__) | ||
22 | #error "Only <gnunet_util_lib.h> can be included directly." | ||
23 | #endif | ||
24 | |||
21 | /** | 25 | /** |
26 | * @addtogroup libgnunetutil | ||
27 | * Multi-function utilities library for GNUnet programs | ||
28 | * @{ | ||
29 | * | ||
22 | * @author Christian Grothoff | 30 | * @author Christian Grothoff |
23 | * @author Krista Bennett | 31 | * @author Krista Bennett |
24 | * @author Gerd Knorr <kraxel@bytesex.org> | 32 | * @author Gerd Knorr <kraxel@bytesex.org> |
@@ -56,10 +64,6 @@ extern "C" | |||
56 | #endif | 64 | #endif |
57 | #endif | 65 | #endif |
58 | 66 | ||
59 | #include "gnunet_common.h" | ||
60 | #include "gnunet_configuration_lib.h" | ||
61 | #include "gnunet_scheduler_lib.h" | ||
62 | |||
63 | 67 | ||
64 | /** | 68 | /** |
65 | * Flags that determine which of the standard streams | 69 | * Flags that determine which of the standard streams |
@@ -379,14 +383,14 @@ GNUNET_OS_get_suid_binary_path (const struct GNUNET_CONFIGURATION_Handle *cfg, | |||
379 | * @param addrlen length of the address | 383 | * @param addrlen length of the address |
380 | * @return #GNUNET_OK to continue iteration, #GNUNET_SYSERR to abort | 384 | * @return #GNUNET_OK to continue iteration, #GNUNET_SYSERR to abort |
381 | */ | 385 | */ |
382 | typedef int | 386 | typedef enum GNUNET_GenericReturnValue |
383 | (*GNUNET_OS_NetworkInterfaceProcessor) (void *cls, | 387 | (*GNUNET_OS_NetworkInterfaceProcessor)(void *cls, |
384 | const char *name, | 388 | const char *name, |
385 | int isDefault, | 389 | int isDefault, |
386 | const struct sockaddr *addr, | 390 | const struct sockaddr *addr, |
387 | const struct sockaddr *broadcast_addr, | 391 | const struct sockaddr *broadcast_addr, |
388 | const struct sockaddr *netmask, | 392 | const struct sockaddr *netmask, |
389 | socklen_t addrlen); | 393 | socklen_t addrlen); |
390 | 394 | ||
391 | 395 | ||
392 | /** | 396 | /** |
@@ -608,7 +612,7 @@ GNUNET_OS_command_run (GNUNET_OS_LineProcessor proc, | |||
608 | * @param code return code/signal number | 612 | * @param code return code/signal number |
609 | * @return #GNUNET_OK on success, #GNUNET_NO if the process is still running, #GNUNET_SYSERR otherwise | 613 | * @return #GNUNET_OK on success, #GNUNET_NO if the process is still running, #GNUNET_SYSERR otherwise |
610 | */ | 614 | */ |
611 | int | 615 | enum GNUNET_GenericReturnValue |
612 | GNUNET_OS_process_status (struct GNUNET_OS_Process *proc, | 616 | GNUNET_OS_process_status (struct GNUNET_OS_Process *proc, |
613 | enum GNUNET_OS_ProcessStatusType *type, | 617 | enum GNUNET_OS_ProcessStatusType *type, |
614 | unsigned long *code); | 618 | unsigned long *code); |
@@ -624,7 +628,7 @@ GNUNET_OS_process_status (struct GNUNET_OS_Process *proc, | |||
624 | * @param proc pointer to process structure of the process to wait for | 628 | * @param proc pointer to process structure of the process to wait for |
625 | * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise | 629 | * @return #GNUNET_OK on success, #GNUNET_SYSERR otherwise |
626 | */ | 630 | */ |
627 | int | 631 | enum GNUNET_GenericReturnValue |
628 | GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc); | 632 | GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc); |
629 | 633 | ||
630 | 634 | ||
@@ -637,7 +641,7 @@ GNUNET_OS_process_wait (struct GNUNET_OS_Process *proc); | |||
637 | * @param code return code/signal number | 641 | * @param code return code/signal number |
638 | * @return #GNUNET_OK on success, #GNUNET_NO if the process is still running, #GNUNET_SYSERR otherwise | 642 | * @return #GNUNET_OK on success, #GNUNET_NO if the process is still running, #GNUNET_SYSERR otherwise |
639 | */ | 643 | */ |
640 | int | 644 | enum GNUNET_GenericReturnValue |
641 | GNUNET_OS_process_wait_status (struct GNUNET_OS_Process *proc, | 645 | GNUNET_OS_process_wait_status (struct GNUNET_OS_Process *proc, |
642 | enum GNUNET_OS_ProcessStatusType *type, | 646 | enum GNUNET_OS_ProcessStatusType *type, |
643 | unsigned long *code); | 647 | unsigned long *code); |
@@ -690,4 +694,6 @@ GNUNET_OS_check_helper_binary (const char *binary, | |||
690 | 694 | ||
691 | /** @} */ /* end of group */ | 695 | /** @} */ /* end of group */ |
692 | 696 | ||
697 | /** @} */ /* end of group addition */ | ||
698 | |||
693 | /* end of gnunet_os_lib.h */ | 699 | /* end of gnunet_os_lib.h */ |