diff options
author | Christian Grothoff <christian@grothoff.org> | 2011-12-26 19:31:18 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2011-12-26 19:31:18 +0000 |
commit | c383f02c8b99a55d6d1c87b483a8819c81d5ea05 (patch) | |
tree | 1203ac4adece7aae2aae35df06ddc3bdc6745489 | |
parent | 208eaf28f0a15033e1500373b0570918044e7c61 (diff) | |
download | gnunet-c383f02c8b99a55d6d1c87b483a8819c81d5ea05.tar.gz gnunet-c383f02c8b99a55d6d1c87b483a8819c81d5ea05.zip |
adding GNUNET_FS_time_to_year function to FS API
-rw-r--r-- | src/fs/fs_misc.c | 19 | ||||
-rw-r--r-- | src/include/gnunet_fs_service.h | 10 | ||||
-rw-r--r-- | src/util/os_network.c | 3 |
3 files changed, 31 insertions, 1 deletions
diff --git a/src/fs/fs_misc.c b/src/fs/fs_misc.c index d4afc0d55..89dc48683 100644 --- a/src/fs/fs_misc.c +++ b/src/fs/fs_misc.c | |||
@@ -207,6 +207,25 @@ GNUNET_FS_year_to_time (unsigned int year) | |||
207 | } | 207 | } |
208 | 208 | ||
209 | 209 | ||
210 | /** | ||
211 | * Convert an expiration time to the respective year (rounds) | ||
212 | * | ||
213 | * @param at absolute time | ||
214 | * @return year a year (after 1970), 0 on error | ||
215 | */ | ||
216 | unsigned int | ||
217 | GNUNET_FS_time_to_year (struct GNUNET_TIME_Absolute at) | ||
218 | { | ||
219 | struct tm *t; | ||
220 | time_t tp; | ||
221 | |||
222 | tp = at.abs_value / 1000; /* ms to seconds */ | ||
223 | t = gmtime (&tp); | ||
224 | if (t == NULL) | ||
225 | return 0; | ||
226 | return t->tm_year + 1900; | ||
227 | |||
228 | } | ||
210 | 229 | ||
211 | 230 | ||
212 | /* end of fs_misc.c */ | 231 | /* end of fs_misc.c */ |
diff --git a/src/include/gnunet_fs_service.h b/src/include/gnunet_fs_service.h index ad4441bd3..4b1b1b199 100644 --- a/src/include/gnunet_fs_service.h +++ b/src/include/gnunet_fs_service.h | |||
@@ -1643,6 +1643,16 @@ GNUNET_FS_year_to_time (unsigned int year); | |||
1643 | 1643 | ||
1644 | 1644 | ||
1645 | /** | 1645 | /** |
1646 | * Convert an expiration time to the respective year (rounds) | ||
1647 | * | ||
1648 | * @param at absolute time | ||
1649 | * @return year a year (after 1970), 0 on error | ||
1650 | */ | ||
1651 | unsigned int | ||
1652 | GNUNET_FS_time_to_year (struct GNUNET_TIME_Absolute at); | ||
1653 | |||
1654 | |||
1655 | /** | ||
1646 | * Handle to the file-sharing service. | 1656 | * Handle to the file-sharing service. |
1647 | */ | 1657 | */ |
1648 | struct GNUNET_FS_Handle; | 1658 | struct GNUNET_FS_Handle; |
diff --git a/src/util/os_network.c b/src/util/os_network.c index 83248bf3e..7449f8068 100644 --- a/src/util/os_network.c +++ b/src/util/os_network.c | |||
@@ -105,6 +105,7 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc, | |||
105 | const char *start; | 105 | const char *start; |
106 | char ifc[12]; | 106 | char ifc[12]; |
107 | char addrstr[128]; | 107 | char addrstr[128]; |
108 | char bcstr[128]; | ||
108 | FILE *f; | 109 | FILE *f; |
109 | int have_ifc; | 110 | int have_ifc; |
110 | struct sockaddr_in a4; | 111 | struct sockaddr_in a4; |
@@ -149,7 +150,7 @@ GNUNET_OS_network_interfaces_list (GNUNET_OS_NetworkInterfaceProcessor proc, | |||
149 | while (('\0' != *start) && (isspace (*start))) | 150 | while (('\0' != *start) && (isspace (*start))) |
150 | start++; | 151 | start++; |
151 | if ( /* Linux */ | 152 | if ( /* Linux */ |
152 | (1 == SSCANF (start, "inet addr:%127s", addrstr)) || | 153 | (2 == SSCANF (start, "inet addr:%127s Bcast:%127s", addrstr, bcstr)) || |
153 | (1 == SSCANF (start, "inet6 addr:%127s", addrstr)) || | 154 | (1 == SSCANF (start, "inet6 addr:%127s", addrstr)) || |
154 | /* Solaris, OS X */ | 155 | /* Solaris, OS X */ |
155 | (1 == SSCANF (start, "inet %127s", addrstr)) || | 156 | (1 == SSCANF (start, "inet %127s", addrstr)) || |