[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18828 - in gnunet/src: fs include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r18828 - in gnunet/src: fs include util |
Date: |
Mon, 26 Dec 2011 20:31:18 +0100 |
Author: grothoff
Date: 2011-12-26 20:31:18 +0100 (Mon, 26 Dec 2011)
New Revision: 18828
Modified:
gnunet/src/fs/fs_misc.c
gnunet/src/include/gnunet_fs_service.h
gnunet/src/util/os_network.c
Log:
adding GNUNET_FS_time_to_year function to FS API
Modified: gnunet/src/fs/fs_misc.c
===================================================================
--- gnunet/src/fs/fs_misc.c 2011-12-26 16:58:58 UTC (rev 18827)
+++ gnunet/src/fs/fs_misc.c 2011-12-26 19:31:18 UTC (rev 18828)
@@ -207,6 +207,25 @@
}
+/**
+ * Convert an expiration time to the respective year (rounds)
+ *
+ * @param at absolute time
+ * @return year a year (after 1970), 0 on error
+ */
+unsigned int
+GNUNET_FS_time_to_year (struct GNUNET_TIME_Absolute at)
+{
+ struct tm *t;
+ time_t tp;
+ tp = at.abs_value / 1000; /* ms to seconds */
+ t = gmtime (&tp);
+ if (t == NULL)
+ return 0;
+ return t->tm_year + 1900;
+}
+
+
/* end of fs_misc.c */
Modified: gnunet/src/include/gnunet_fs_service.h
===================================================================
--- gnunet/src/include/gnunet_fs_service.h 2011-12-26 16:58:58 UTC (rev
18827)
+++ gnunet/src/include/gnunet_fs_service.h 2011-12-26 19:31:18 UTC (rev
18828)
@@ -1643,6 +1643,16 @@
/**
+ * Convert an expiration time to the respective year (rounds)
+ *
+ * @param at absolute time
+ * @return year a year (after 1970), 0 on error
+ */
+unsigned int
+GNUNET_FS_time_to_year (struct GNUNET_TIME_Absolute at);
+
+
+/**
* Handle to the file-sharing service.
*/
struct GNUNET_FS_Handle;
Modified: gnunet/src/util/os_network.c
===================================================================
--- gnunet/src/util/os_network.c 2011-12-26 16:58:58 UTC (rev 18827)
+++ gnunet/src/util/os_network.c 2011-12-26 19:31:18 UTC (rev 18828)
@@ -105,6 +105,7 @@
const char *start;
char ifc[12];
char addrstr[128];
+ char bcstr[128];
FILE *f;
int have_ifc;
struct sockaddr_in a4;
@@ -149,7 +150,7 @@
while (('\0' != *start) && (isspace (*start)))
start++;
if ( /* Linux */
- (1 == SSCANF (start, "inet addr:%127s", addrstr)) ||
+ (2 == SSCANF (start, "inet addr:%127s Bcast:%127s", addrstr, bcstr)) ||
(1 == SSCANF (start, "inet6 addr:%127s", addrstr)) ||
/* Solaris, OS X */
(1 == SSCANF (start, "inet %127s", addrstr)) ||
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18828 - in gnunet/src: fs include util,
gnunet <=