diff options
author | ng0 <ng0@n0.is> | 2019-09-09 19:17:18 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-09-09 19:17:18 +0000 |
commit | 483b0139a218a5f8a8311bda3eb23bcd88f57688 (patch) | |
tree | d9e7a0f5053cdaa1a720485b93e9927f08466958 /src/arm | |
parent | ec472b1aae122481f4f7e760e5242753eba9bf87 (diff) | |
download | gnunet-483b0139a218a5f8a8311bda3eb23bcd88f57688.tar.gz gnunet-483b0139a218a5f8a8311bda3eb23bcd88f57688.zip |
Remove win32 and cygwin support
Diffstat (limited to 'src/arm')
-rw-r--r-- | src/arm/gnunet-service-arm.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/arm/gnunet-service-arm.c b/src/arm/gnunet-service-arm.c index e8c740235..e02314b91 100644 --- a/src/arm/gnunet-service-arm.c +++ b/src/arm/gnunet-service-arm.c | |||
@@ -763,11 +763,8 @@ start_process(struct ServiceList *sl, | |||
763 | sli->accept_task = NULL; | 763 | sli->accept_task = NULL; |
764 | } | 764 | } |
765 | } | 765 | } |
766 | #if WINDOWS | 766 | |
767 | GNUNET_array_append(lsocks, ls, INVALID_SOCKET); | ||
768 | #else | ||
769 | GNUNET_array_append(lsocks, ls, -1); | 767 | GNUNET_array_append(lsocks, ls, -1); |
770 | #endif | ||
771 | 768 | ||
772 | /* obtain configuration */ | 769 | /* obtain configuration */ |
773 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(cfg, | 770 | if (GNUNET_OK != GNUNET_CONFIGURATION_get_value_string(cfg, |
@@ -1002,10 +999,8 @@ create_listen_socket(struct sockaddr *sa, | |||
1002 | struct GNUNET_NETWORK_Handle *sock; | 999 | struct GNUNET_NETWORK_Handle *sock; |
1003 | struct ServiceListeningInfo *sli; | 1000 | struct ServiceListeningInfo *sli; |
1004 | 1001 | ||
1005 | #ifndef WINDOWS | ||
1006 | int match_uid; | 1002 | int match_uid; |
1007 | int match_gid; | 1003 | int match_gid; |
1008 | #endif | ||
1009 | 1004 | ||
1010 | switch (sa->sa_family) | 1005 | switch (sa->sa_family) |
1011 | { | 1006 | { |
@@ -1056,10 +1051,8 @@ create_listen_socket(struct sockaddr *sa, | |||
1056 | GNUNET_log_strerror(GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, | 1051 | GNUNET_log_strerror(GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK, |
1057 | "setsockopt"); | 1052 | "setsockopt"); |
1058 | #endif | 1053 | #endif |
1059 | #ifndef WINDOWS | ||
1060 | if (AF_UNIX == sa->sa_family) | 1054 | if (AF_UNIX == sa->sa_family) |
1061 | GNUNET_NETWORK_unix_precheck((struct sockaddr_un *)sa); | 1055 | GNUNET_NETWORK_unix_precheck((struct sockaddr_un *)sa); |
1062 | #endif | ||
1063 | if (GNUNET_OK != | 1056 | if (GNUNET_OK != |
1064 | GNUNET_NETWORK_socket_bind(sock, (const struct sockaddr *)sa, addr_len)) | 1057 | GNUNET_NETWORK_socket_bind(sock, (const struct sockaddr *)sa, addr_len)) |
1065 | { | 1058 | { |
@@ -1074,7 +1067,6 @@ create_listen_socket(struct sockaddr *sa, | |||
1074 | GNUNET_free(sa); | 1067 | GNUNET_free(sa); |
1075 | return; | 1068 | return; |
1076 | } | 1069 | } |
1077 | #ifndef WINDOWS | ||
1078 | if ((AF_UNIX == sa->sa_family) | 1070 | if ((AF_UNIX == sa->sa_family) |
1079 | #ifdef LINUX | 1071 | #ifdef LINUX |
1080 | /* Permission settings are not required when abstract sockets are used */ | 1072 | /* Permission settings are not required when abstract sockets are used */ |
@@ -1090,7 +1082,6 @@ create_listen_socket(struct sockaddr *sa, | |||
1090 | match_uid, | 1082 | match_uid, |
1091 | match_gid); | 1083 | match_gid); |
1092 | } | 1084 | } |
1093 | #endif | ||
1094 | if (GNUNET_OK != GNUNET_NETWORK_socket_listen(sock, 5)) | 1085 | if (GNUNET_OK != GNUNET_NETWORK_socket_listen(sock, 5)) |
1095 | { | 1086 | { |
1096 | GNUNET_log_strerror(GNUNET_ERROR_TYPE_ERROR, "listen"); | 1087 | GNUNET_log_strerror(GNUNET_ERROR_TYPE_ERROR, "listen"); |
@@ -1884,13 +1875,9 @@ setup_service(void *cls, const char *section) | |||
1884 | sl->config = config; | 1875 | sl->config = config; |
1885 | sl->backoff = GNUNET_TIME_UNIT_MILLISECONDS; | 1876 | sl->backoff = GNUNET_TIME_UNIT_MILLISECONDS; |
1886 | sl->restart_at = GNUNET_TIME_UNIT_FOREVER_ABS; | 1877 | sl->restart_at = GNUNET_TIME_UNIT_FOREVER_ABS; |
1887 | #if WINDOWS | ||
1888 | sl->pipe_control = GNUNET_YES; | ||
1889 | #else | ||
1890 | if (GNUNET_CONFIGURATION_have_value(cfg, section, "PIPECONTROL")) | 1878 | if (GNUNET_CONFIGURATION_have_value(cfg, section, "PIPECONTROL")) |
1891 | sl->pipe_control = | 1879 | sl->pipe_control = |
1892 | GNUNET_CONFIGURATION_get_value_yesno(cfg, section, "PIPECONTROL"); | 1880 | GNUNET_CONFIGURATION_get_value_yesno(cfg, section, "PIPECONTROL"); |
1893 | #endif | ||
1894 | GNUNET_CONTAINER_DLL_insert(running_head, running_tail, sl); | 1881 | GNUNET_CONTAINER_DLL_insert(running_head, running_tail, sl); |
1895 | if (GNUNET_YES == | 1882 | if (GNUNET_YES == |
1896 | GNUNET_CONFIGURATION_get_value_yesno(cfg, section, "IMMEDIATE_START")) | 1883 | GNUNET_CONFIGURATION_get_value_yesno(cfg, section, "IMMEDIATE_START")) |