projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'credentials' of git+ssh://gnunet.org/gnunet into credentials
[oweals/gnunet.git]
/
src
/
gns
/
w32nsp.c
diff --git
a/src/gns/w32nsp.c
b/src/gns/w32nsp.c
index 9abdb8bed86a38e569626ccc5161a7af2347a574..3e926fcc429ad407605451120f249dad5770ec01 100644
(file)
--- a/
src/gns/w32nsp.c
+++ b/
src/gns/w32nsp.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2012 Christian Grothoff (and other contributing authors)
+ Copyright (C) 2012 GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-14,8
+14,8
@@
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
You should have received a copy of the GNU General Public License
along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 5
9 Temple Place - Suite 330
,
- Boston, MA 0211
1-1307
, USA.
+ Free Software Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+ Boston, MA 0211
0-1301
, USA.
*/
/**
* @file gns/w32nsp.c
*/
/**
* @file gns/w32nsp.c
@@
-71,7
+71,7
@@
#endif
#endif
#include "w32resolver.h"
#endif
#endif
#include "w32resolver.h"
-#
define INITGUID
+#
include <initguid.h>
#include "gnunet_w32nsp_lib.h"
#undef INITGUID
#include "gnunet_w32nsp_lib.h"
#undef INITGUID
@@
-103,7
+103,7
@@
resize_records ()
SetLastError (WSA_NOT_ENOUGH_MEMORY);
return 0;
}
SetLastError (WSA_NOT_ENOUGH_MEMORY);
return 0;
}
- memcpy (new_records, records, records_len * sizeof (struct record));
+
GNUNET_
memcpy (new_records, records, records_len * sizeof (struct record));
memset (&new_records[records_len], 0, sizeof (struct record) * (new_size - records_len));
records_size = new_size;
free (records);
memset (&new_records[records_len], 0, sizeof (struct record) * (new_size - records_len));
records_size = new_size;
free (records);
@@
-229,7
+229,7
@@
send_name_to_ip_request (LPWSAQUERYSETW lpqsRestrictions,
else
msg->af = htonl (AF_UNSPEC);
if (lpqsRestrictions->lpszServiceInstanceName)
else
msg->af = htonl (AF_UNSPEC);
if (lpqsRestrictions->lpszServiceInstanceName)
- memcpy (&msg[1], lpqsRestrictions->lpszServiceInstanceName, namelen);
+
GNUNET_
memcpy (&msg[1], lpqsRestrictions->lpszServiceInstanceName, namelen);
msg->sc_data1 = htonl (lpqsRestrictions->lpServiceClassId->Data1);
msg->sc_data2 = htons (lpqsRestrictions->lpServiceClassId->Data2);
msg->sc_data3 = htons (lpqsRestrictions->lpServiceClassId->Data3);
msg->sc_data1 = htonl (lpqsRestrictions->lpServiceClassId->Data1);
msg->sc_data2 = htons (lpqsRestrictions->lpServiceClassId->Data2);
msg->sc_data3 = htons (lpqsRestrictions->lpServiceClassId->Data3);
@@
-425,7
+425,7
@@
GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags,
//LeaveCriticalSection (&records_cs);
return SOCKET_ERROR;
}
//LeaveCriticalSection (&records_cs);
return SOCKET_ERROR;
}
- memcpy (lpqsResults, &((struct GNUNET_W32RESOLVER_GetMessage *)records[rec].buf)[1], header.size - sizeof (struct GNUNET_W32RESOLVER_GetMessage));
+
GNUNET_
memcpy (lpqsResults, &((struct GNUNET_W32RESOLVER_GetMessage *)records[rec].buf)[1], header.size - sizeof (struct GNUNET_W32RESOLVER_GetMessage));
free (records[rec].buf);
records[rec].buf = NULL;
//LeaveCriticalSection (&records_cs);
free (records[rec].buf);
records[rec].buf = NULL;
//LeaveCriticalSection (&records_cs);
@@
-508,7
+508,7
@@
GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags,
}
records[rec].state |= 8;
//LeaveCriticalSection (&records_cs);
}
records[rec].state |= 8;
//LeaveCriticalSection (&records_cs);
- memcpy (buf, &header, sizeof (header));
+
GNUNET_
memcpy (buf, &header, sizeof (header));
to_receive = header.size - sizeof (header);
rc = 0;
#if VERBOSE
to_receive = header.size - sizeof (header);
rc = 0;
#if VERBOSE
@@
-567,7
+567,7
@@
GNUNET_W32NSP_LookupServiceNext (HANDLE hLookup, DWORD dwControlFlags,
}
//LeaveCriticalSection (&records_cs);
DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: writing %d bytes into result buffer\n", header.size - sizeof (struct GNUNET_W32RESOLVER_GetMessage));
}
//LeaveCriticalSection (&records_cs);
DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: writing %d bytes into result buffer\n", header.size - sizeof (struct GNUNET_W32RESOLVER_GetMessage));
- memcpy (lpqsResults, &((struct GNUNET_W32RESOLVER_GetMessage *)buf)[1], header.size - sizeof (struct GNUNET_W32RESOLVER_GetMessage));
+
GNUNET_
memcpy (lpqsResults, &((struct GNUNET_W32RESOLVER_GetMessage *)buf)[1], header.size - sizeof (struct GNUNET_W32RESOLVER_GetMessage));
free (buf);
DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: OK\n");
UnmarshallWSAQUERYSETW ((LPWSAQUERYSETW) lpqsResults);
free (buf);
DEBUGLOG ("GNUNET_W32NSP_LookupServiceNext: OK\n");
UnmarshallWSAQUERYSETW ((LPWSAQUERYSETW) lpqsResults);