[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r10291 - gnunet/src/hello
From: |
gnunet |
Subject: |
[GNUnet-SVN] r10291 - gnunet/src/hello |
Date: |
Mon, 15 Feb 2010 00:58:22 +0100 |
Author: grothoff
Date: 2010-02-15 00:58:22 +0100 (Mon, 15 Feb 2010)
New Revision: 10291
Modified:
gnunet/src/hello/hello.c
Log:
also match tname
Modified: gnunet/src/hello/hello.c
===================================================================
--- gnunet/src/hello/hello.c 2010-02-14 22:56:35 UTC (rev 10290)
+++ gnunet/src/hello/hello.c 2010-02-14 23:58:22 UTC (rev 10291)
@@ -274,6 +274,7 @@
struct ExpireContext
{
const void *addr;
+ const char *tname;
size_t addrlen;
int found;
struct GNUNET_TIME_Absolute expiration;
@@ -288,7 +289,9 @@
{
struct ExpireContext *ec = cls;
- if ((addrlen == ec->addrlen) && (0 == memcmp (addr, ec->addr, addrlen)))
+ if ( (addrlen == ec->addrlen) &&
+ (0 == memcmp (addr, ec->addr, addrlen)) &&
+ (0 == strcmp (tname, ec->tname)) )
{
ec->found = GNUNET_YES;
ec->expiration = expiration;
@@ -323,17 +326,20 @@
ec.addr = addr;
ec.addrlen = addrlen;
ec.found = GNUNET_NO;
+ ec.tname = tname;
GNUNET_HELLO_iterate_addresses (mc->other, GNUNET_NO, &get_match_exp, &ec);
- if ((ec.found == GNUNET_NO) ||
- ((ec.expiration.value < expiration.value) ||
- ((ec.expiration.value == expiration.value) &&
- (mc->take_equal == GNUNET_YES))))
- mc->ret += GNUNET_HELLO_add_address (tname,
- expiration,
- addr,
- addrlen,
- &mc->buf[mc->ret],
- mc->max - mc->ret);
+ if ( (ec.found == GNUNET_NO) ||
+ (ec.expiration.value < expiration.value) ||
+ ( (ec.expiration.value == expiration.value) &&
+ (mc->take_equal == GNUNET_YES) ) )
+ {
+ mc->ret += GNUNET_HELLO_add_address (tname,
+ expiration,
+ addr,
+ addrlen,
+ &mc->buf[mc->ret],
+ mc->max - mc->ret);
+ }
return GNUNET_OK;
}
@@ -403,6 +409,7 @@
ec.addr = addr;
ec.addrlen = addrlen;
ec.found = GNUNET_NO;
+ ec.tname = tname;
GNUNET_HELLO_iterate_addresses (dc->old_hello,
GNUNET_NO, &get_match_exp, &ec);
if ((ec.found == GNUNET_YES) &&
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r10291 - gnunet/src/hello,
gnunet <=