[Olsr-cvs] olsrd-current/src build_msg.c, 1.40, 1.41 duplicate_set.c, 1.20, 1.21 hna_set.c, 1.27, 1.28 ipc_frontend.c, 1.41, 1.42 link_set.c, 1.78, 1.79 lq_packet.c, 1.33, 1.34 mid_set.c, 1.25, 1.26 mpr_selector_set.c, 1.21, 1.22 neighbor_table.c, 1.36, 1.37 packet.c, 1.27, 1.28 parser.c, 1.38, 1.39 process_package.c, 1.47, 1.48 rebuild_packet.c, 1.26, 1.27 routing_table.c, 1.36, 1.37 tc_set.c, 1.38, 1.39
Bernd Petrovitsch
(spam-protected)
Thu Nov 29 19:10:19 CET 2007
Update of /cvsroot/olsrd/olsrd-current/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv4460/src
Modified Files:
build_msg.c duplicate_set.c hna_set.c ipc_frontend.c
link_set.c lq_packet.c mid_set.c mpr_selector_set.c
neighbor_table.c packet.c parser.c process_package.c
rebuild_packet.c routing_table.c tc_set.c
Log Message:
* removed the commented out COPY_IP() and COMP_IP() macros - everything seems to work
Index: duplicate_set.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/duplicate_set.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** duplicate_set.c 29 Nov 2007 00:49:38 -0000 1.20
--- duplicate_set.c 29 Nov 2007 18:10:11 -0000 1.21
***************
*** 96,100 ****
/* Address */
- //COPY_IP(&new_dup_entry->addr, originator);
new_dup_entry->addr = *originator;
/* Seqno */
--- 96,99 ----
***************
*** 289,293 ****
new_iface = olsr_malloc(sizeof(struct dup_iface), "New dup iface");
- //COPY_IP(&new_iface->addr, iface);
new_iface->addr = *iface;
new_iface->next = tmp_dup_table->ifaces;
--- 288,291 ----
Index: mid_set.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/mid_set.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** mid_set.c 29 Nov 2007 00:49:38 -0000 1.25
--- mid_set.c 29 Nov 2007 18:10:13 -0000 1.26
***************
*** 144,148 ****
alias->main_entry = tmp;
QUEUE_ELEM(reverse_mid_set[alias_hash], alias);
- //COPY_IP(&tmp->main_addr, m_addr);
tmp->main_addr = *m_addr;
tmp->ass_timer = GET_TIMESTAMP(vtime*1000);
--- 144,147 ----
***************
*** 235,239 ****
OLSR_PRINTF(1, "%s\n", olsr_ip_to_string(&buf1, main_add));
- //COPY_IP(&adr->alias, alias);
adr->alias = *alias;
adr->next_alias = NULL;
--- 234,237 ----
Index: ipc_frontend.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/ipc_frontend.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ipc_frontend.c 29 Nov 2007 00:49:38 -0000 1.41
--- ipc_frontend.c 29 Nov 2007 18:10:12 -0000 1.42
***************
*** 282,286 ****
packet.msgtype = ROUTE_IPC;
- //COPY_IP(&packet.target_addr, dst);
packet.target_addr = *dst;
--- 282,285 ----
***************
*** 289,293 ****
{
packet.metric = met;
- //COPY_IP(&packet.gateway_addr, gw);
packet.gateway_addr = *gw;
}
--- 288,291 ----
***************
*** 347,351 ****
packet.msgtype = ROUTE_IPC;
- //COPY_IP(&packet.target_addr, &rt->rt_dst.prefix);
packet.target_addr = rt->rt_dst.prefix;
--- 345,348 ----
***************
*** 353,357 ****
packet.metric = (olsr_u8_t)(rt->rt_best->rtp_metric.hops);
- //COPY_IP(&packet.gateway_addr, &rt->rt_nexthop.gateway);
packet.gateway_addr = rt->rt_nexthop.gateway;
--- 350,353 ----
***************
*** 420,424 ****
/* Main addr */
- //COPY_IP(&net_msg->main_addr, &olsr_cnf->main_addr);
net_msg->main_addr = olsr_cnf->main_addr;
--- 416,419 ----
Index: rebuild_packet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/rebuild_packet.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** rebuild_packet.c 29 Nov 2007 00:49:39 -0000 1.26
--- rebuild_packet.c 29 Nov 2007 18:10:17 -0000 1.27
***************
*** 81,85 ****
no_pairs = (ntohs(m->v4.olsr_msgsize) - 12) / 8;
- //COPY_IP(&hmsg->originator, &m->v4.originator);
hmsg->originator.v4.s_addr = m->v4.originator;
--- 81,84 ----
***************
*** 98,104 ****
hna_pairs = olsr_malloc(sizeof(struct hna_net_addr), "HNA chgestruct");
- //COPY_IP(&hna_pairs->net, &haddr->addr);
hna_pairs->net.v4.s_addr = haddr->addr;
- //COPY_IP(&hna_pairs->netmask, &haddr->netmask);
hna_pairs->prefixlen = olsr_netmask4_to_prefix(&haddr->netmask);
--- 97,101 ----
***************
*** 120,124 ****
no_pairs = (ntohs(m->v6.olsr_msgsize) - 24) / 32; /* NB 32 not 8 */
- //COPY_IP(&hmsg->originator, &m->v6.originator);
hmsg->originator.v6 = m->v6.originator;
hmsg->packet_seq_number = ntohs(m->v6.seqno);
--- 117,120 ----
***************
*** 136,140 ****
hna_pairs = olsr_malloc(sizeof(struct hna_net_addr), "HNA chgestruct 2");
- //COPY_IP(&hna_pairs->net, &haddr6->addr);
hna_pairs->net.v6 = haddr6->addr;
hna_pairs->prefixlen = olsr_netmask6_to_prefix(&haddr6->netmask);
--- 132,135 ----
***************
*** 200,206 ****
//printf("Aliases: %d\n", no_aliases);
- //COPY_IP(&mmsg->mid_origaddr, &m->v4.originator);
mmsg->mid_origaddr.v4.s_addr = m->v4.originator;
- //COPY_IP(&mmsg->addr, &m->v4.originator);
mmsg->addr.v4.s_addr = m->v4.originator;
/*seq number*/
--- 195,199 ----
***************
*** 218,222 ****
alias = olsr_malloc(sizeof(struct mid_alias), "MID chgestruct");
- //COPY_IP(&alias->alias_addr, &maddr->addr);
alias->alias_addr.v4.s_addr = maddr->addr;
alias->next = mmsg->mid_addr;
--- 211,214 ----
***************
*** 254,260 ****
//printf("Aliases: %d\n", no_aliases);
- //COPY_IP(&mmsg->mid_origaddr, &m->v6.originator);
mmsg->mid_origaddr.v6 = m->v6.originator;
- //COPY_IP(&mmsg->addr, &m->v6.originator);
mmsg->addr.v6 = m->v6.originator;
/*seq number*/
--- 246,250 ----
***************
*** 272,276 ****
//printf("Adding alias: %s\n", olsr_ip_to_string(&buf, (union olsr_ip_addr *)&maddr6->addr));
- //COPY_IP(&alias->alias_addr, &maddr6->addr);
alias->alias_addr.v6 = maddr6->addr;
alias->next = mmsg->mid_addr;
--- 262,265 ----
***************
*** 326,330 ****
/* IPv4 */
/* address */
- //COPY_IP(&umsg->originator, &m->v4.originator);
umsg->originator.v4.s_addr = m->v4.originator;
/*seq number*/
--- 315,318 ----
***************
*** 337,341 ****
/* IPv6 */
/* address */
- //COPY_IP(&umsg->originator, &m->v6.originator);
umsg->originator.v6 = m->v6.originator;
/*seq number*/
--- 325,328 ----
***************
*** 374,378 ****
/* IPv4 */
- //COPY_IP(&hmsg->source_addr, &m->v4.originator);
hmsg->source_addr.v4.s_addr = m->v4.originator;
hmsg->packet_seq_number = ntohs(m->v4.seqno);
--- 361,364 ----
***************
*** 401,405 ****
nb = olsr_malloc(sizeof (struct hello_neighbor), "HELLO chgestruct");
- //COPY_IP(&nb->address, hadr);
nb->address = *hadr;
--- 387,390 ----
***************
*** 420,424 ****
/* IPv6 */
- //COPY_IP(&hmsg->source_addr, &m->v6.originator);
hmsg->source_addr.v6 = m->v6.originator;
//printf("parsing HELLO from %s\n", olsr_ip_to_string(&buf, &hmsg->source_addr));
--- 405,408 ----
***************
*** 448,452 ****
nb = olsr_malloc(sizeof (struct hello_neighbor), "OLSR chgestruct 2");
- //COPY_IP(&nb->address, hadr);
nb->address = *hadr;
--- 432,435 ----
Index: process_package.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/process_package.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** process_package.c 29 Nov 2007 00:49:39 -0000 1.47
--- process_package.c 29 Nov 2007 18:10:17 -0000 1.48
***************
*** 98,102 ****
if (neigh_addr != NULL) {
- //COPY_IP(&message_neighbors->address, neigh_addr);
message_neighbors->address = *neigh_addr;
}
--- 98,101 ----
***************
*** 166,170 ****
two_hop_neighbor->neighbor_2_pointer = 0;
- //COPY_IP(&two_hop_neighbor->neighbor_2_addr,&message_neighbors->address);
two_hop_neighbor->neighbor_2_addr = message_neighbors->address;
--- 165,168 ----
Index: tc_set.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/tc_set.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** tc_set.c 29 Nov 2007 00:49:39 -0000 1.38
--- tc_set.c 29 Nov 2007 18:10:17 -0000 1.39
***************
*** 195,199 ****
/* Fill entry */
- //COPY_IP(&tc->addr, adr);
tc->addr = *adr;
tc->vertex_node.data = tc;
--- 195,198 ----
Index: hna_set.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/hna_set.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** hna_set.c 29 Nov 2007 01:29:53 -0000 1.27
--- hna_set.c 29 Nov 2007 18:10:12 -0000 1.28
***************
*** 141,145 ****
/* Fill struct */
- //COPY_IP(&new_entry->A_gateway_addr, addr);
new_entry->A_gateway_addr = *addr;
--- 141,144 ----
***************
*** 179,183 ****
/* Fill struct */
- //COPY_IP(&new_net->A_network_addr, net);
new_net->A_network_addr = *net;
//memcpy(&new_net->A_netmask, mask, netmask_size);
--- 178,181 ----
Index: mpr_selector_set.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/mpr_selector_set.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** mpr_selector_set.c 29 Nov 2007 00:49:38 -0000 1.21
--- mpr_selector_set.c 29 Nov 2007 18:10:13 -0000 1.22
***************
*** 114,118 ****
/* Fill struct */
- //COPY_IP(&new_entry->MS_main_addr, addr);
new_entry->MS_main_addr = *addr;
new_entry->MS_time = GET_TIMESTAMP(vtime*1000);
--- 114,117 ----
Index: parser.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/parser.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** parser.c 29 Nov 2007 00:49:39 -0000 1.38
--- parser.c 29 Nov 2007 18:10:17 -0000 1.39
***************
*** 422,426 ****
{
/* IPv4 sender address */
- //COPY_IP(&from_addr, &((struct sockaddr_in *)&from)->sin_addr.s_addr);
from_addr.v4 = ((struct sockaddr_in *)&from)->sin_addr;
}
--- 422,425 ----
***************
*** 428,432 ****
{
/* IPv6 sender address */
- //COPY_IP(&from_addr, &((struct sockaddr_in6 *)&from)->sin6_addr);
from_addr.v6 = ((struct sockaddr_in6 *)&from)->sin6_addr;
}
--- 427,430 ----
***************
*** 496,500 ****
{
fprintf(stderr, "Error receiving host-client IP hook(%d) %s!\n", cc, strerror(errno));
- //COPY_IP(&from_addr, &((struct olsr *)inbuf)->olsr_msg->originator);
memcpy(&from_addr, &((struct olsr *)inbuf)->olsr_msg->originator, olsr_cnf->ipsize);
}
--- 494,497 ----
Index: build_msg.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/build_msg.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** build_msg.c 29 Nov 2007 00:49:38 -0000 1.40
--- build_msg.c 29 Nov 2007 18:10:11 -0000 1.41
***************
*** 298,302 ****
m->v4.olsr_msgtype = HELLO_MESSAGE;
/* Set source(main) addr */
- //COPY_IP(&m->v4.originator, &olsr_cnf->main_addr);
m->v4.originator = olsr_cnf->main_addr.v4.s_addr;
--- 298,301 ----
***************
*** 395,399 ****
}
- //COPY_IP(haddr, &nb->address);
*haddr = nb->address;
--- 394,397 ----
***************
*** 474,478 ****
m->v6.hopcnt = 0;
/* Set source(main) addr */
- //COPY_IP(&m->v6.originator, &olsr_cnf->main_addr);
m->v6.originator = olsr_cnf->main_addr.v6;
m->v6.olsr_msgtype = HELLO_MESSAGE;
--- 472,475 ----
***************
*** 565,569 ****
}
- //COPY_IP(haddr, &nb->address);
*haddr = nb->address;
--- 562,565 ----
***************
*** 646,650 ****
m->v4.hopcnt = message->hop_count;
m->v4.ttl = message->ttl;
- //COPY_IP(&m->v4.originator, &message->originator);
m->v4.originator = message->originator.v4.s_addr;
--- 642,645 ----
***************
*** 690,694 ****
olsr_ip_to_string(&buf, &mprs->address));
#endif
- //COPY_IP(&mprsaddr->addr, &mprs->address);
mprsaddr->addr = mprs->address.v4.s_addr;
curr_size += olsr_cnf->ipsize;
--- 685,688 ----
***************
*** 774,778 ****
m->v6.hopcnt = message->hop_count;
m->v6.ttl = message->ttl;
- //COPY_IP(&m->v6.originator, &message->originator);
m->v6.originator = message->originator.v6;
--- 768,771 ----
***************
*** 814,818 ****
olsr_ip_to_string(&buf, &mprs->address));
#endif
- //COPY_IP(&mprsaddr6->addr, &mprs->address);
mprsaddr6->addr = mprs->address.v6;
curr_size += olsr_cnf->ipsize;
--- 807,810 ----
***************
*** 889,893 ****
m->v4.ttl = MAX_TTL;
/* Set main(first) address */
- //COPY_IP(&m->v4.originator, &olsr_cnf->main_addr);
m->v4.originator = olsr_cnf->main_addr.v4.s_addr;
m->v4.olsr_msgtype = MID_MESSAGE;
--- 881,884 ----
***************
*** 931,935 ****
#endif
- //COPY_IP(&addrs->addr, &ifs->ip_addr);
addrs->addr = ifs->ip_addr.v4.s_addr;
addrs++;
--- 922,925 ----
***************
*** 995,999 ****
m->v6.olsr_vtime = ifp->valtimes.mid;
/* Set main(first) address */
- //COPY_IP(&m->v6.originator, &olsr_cnf->main_addr);
m->v6.originator = olsr_cnf->main_addr.v6;
--- 985,988 ----
***************
*** 1034,1038 ****
#endif
- //COPY_IP(&addrs6->addr, &ifs->ip_addr);
addrs6->addr = ifs->ip_addr.v6;
addrs6++;
--- 1023,1026 ----
***************
*** 1097,1101 ****
/* Fill header */
- //COPY_IP(&m->v4.originator, &olsr_cnf->main_addr);
m->v4.originator = olsr_cnf->main_addr.v4.s_addr;
m->v4.hopcnt = 0;
--- 1085,1088 ----
***************
*** 1130,1136 ****
OLSR_PRINTF(BMSG_DBGLVL, "\tNet: %s\n", olsr_ip_prefix_to_string(&h->net));
#endif
- //COPY_IP(&pair->addr, &h->net);
pair->addr = h->net.prefix.v4.s_addr;
- //COPY_IP(&pair->netmask, &h->netmask);
olsr_prefix_to_netmask(&ip_addr, h->net.prefix_len);
pair->netmask = ip_addr.v4.s_addr;
--- 1117,1121 ----
***************
*** 1185,1189 ****
/* Fill header */
- //COPY_IP(&m->v6.originator, &olsr_cnf->main_addr);
m->v6.originator = olsr_cnf->main_addr.v6;
m->v6.hopcnt = 0;
--- 1170,1173 ----
***************
*** 1218,1224 ****
OLSR_PRINTF(BMSG_DBGLVL, "\tNet: %s\n", olsr_ip_prefix_to_string(&h->net));
#endif
- //COPY_IP(&pair6->addr, &h->net);
pair6->addr = h->net.prefix.v6;
- //COPY_IP(&pair6->netmask, &tmp_netmask);
olsr_prefix_to_netmask(&tmp_netmask, h->net.prefix_len);
pair6->netmask = tmp_netmask.v6;
--- 1202,1206 ----
Index: routing_table.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/routing_table.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** routing_table.c 29 Nov 2007 00:49:39 -0000 1.36
--- routing_table.c 29 Nov 2007 18:10:17 -0000 1.37
***************
*** 250,254 ****
memset(rtp, 0, sizeof(*rtp));
- //COPY_IP(&rtp->rtp_originator, originator);
rtp->rtp_originator = *originator;
--- 250,253 ----
Index: link_set.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/link_set.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -d -r1.78 -r1.79
*** link_set.c 29 Nov 2007 00:49:38 -0000 1.78
--- link_set.c 29 Nov 2007 18:10:13 -0000 1.79
***************
*** 508,515 ****
*/
//printf("\tLocal IF: %s\n", olsr_ip_to_string(local));
- //COPY_IP(&new_link->local_iface_addr, local);
new_link->local_iface_addr = *local;
/* L_neighbor_iface_addr = Source Address */
- //COPY_IP(&new_link->neighbor_iface_addr, remote);
new_link->neighbor_iface_addr = *remote;
--- 508,513 ----
***************
*** 586,603 ****
}
- /* Copy the main address - make sure this is done every time
- * as neighbors might change main address */
- /* Erik Tromp - OOPS! Don't do this! Neighbor entries are hashed through their
- * neighbor_main_addr field, and when that field is changed, their position
- * in the hash table is no longer correct, so that the function
- * olsr_lookup_neighbor_table() can no longer find the neighbor
- * entry. */
- /*COPY_IP(&neighbor->neighbor_main_addr, remote_main);*/
-
neighbor->linkcount++;
-
-
new_link->neighbor = neighbor;
-
if(!ipequal(remote, remote_main))
{
--- 584,589 ----
Index: packet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/packet.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** packet.c 29 Nov 2007 00:49:39 -0000 1.27
--- packet.c 29 Nov 2007 18:10:16 -0000 1.28
***************
*** 112,116 ****
message->ttl = 1;
- //COPY_IP(&message->source_addr, &olsr_cnf->main_addr);
message->source_addr = olsr_cnf->main_addr;
--- 112,115 ----
***************
*** 191,199 ****
/* Set the remote interface address */
- //COPY_IP(&message_neighbor->address, &links->neighbor_iface_addr);
message_neighbor->address = links->neighbor_iface_addr;
/* Set the main address */
- //COPY_IP(&message_neighbor->main_address, &links->neighbor->neighbor_main_addr);
message_neighbor->main_address = links->neighbor->neighbor_main_addr;
#ifdef DEBUG
--- 190,196 ----
***************
*** 294,301 ****
- //COPY_IP(&message_neighbor->address, &neighbor->neighbor_main_addr);
message_neighbor->address = neighbor->neighbor_main_addr;
- //COPY_IP(&message_neighbor->main_address, &neighbor->neighbor_main_addr);
message_neighbor->main_address = neighbor->neighbor_main_addr;
#ifdef DEBUG
--- 291,296 ----
***************
*** 359,365 ****
message->ansn = get_local_ansn();
- //COPY_IP(&message->originator, &olsr_cnf->main_addr);
message->originator = olsr_cnf->main_addr;
- //COPY_IP(&message->source_addr, &olsr_cnf->main_addr);
message->source_addr = olsr_cnf->main_addr;
--- 354,358 ----
***************
*** 383,387 ****
message_mpr = olsr_malloc(sizeof(struct tc_mpr_addr), "Build TC");
- //COPY_IP(&message_mpr->address, &entry->neighbor_main_addr);
message_mpr->address = entry->neighbor_main_addr;
message_mpr->next = message->multipoint_relay_selector_address;
--- 376,379 ----
***************
*** 400,404 ****
message_mpr = olsr_malloc(sizeof(struct tc_mpr_addr), "Build TC 2");
- //COPY_IP(&message_mpr->address, &entry->neighbor_main_addr);
message_mpr->address = entry->neighbor_main_addr;
message_mpr->next = message->multipoint_relay_selector_address;
--- 392,395 ----
***************
*** 416,420 ****
message_mpr = olsr_malloc(sizeof(struct tc_mpr_addr), "Build TC 3");
- //COPY_IP(&message_mpr->address, &entry->neighbor_main_addr);
message_mpr->address = entry->neighbor_main_addr;
message_mpr->next = message->multipoint_relay_selector_address;
--- 407,410 ----
Index: lq_packet.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/lq_packet.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** lq_packet.c 29 Nov 2007 00:49:38 -0000 1.33
--- lq_packet.c 29 Nov 2007 18:10:13 -0000 1.34
***************
*** 75,79 ****
lq_hello->comm.size = 0;
- //COPY_IP(&lq_hello->comm.orig, &olsr_cnf->main_addr);
lq_hello->comm.orig = olsr_cnf->main_addr;
--- 75,78 ----
***************
*** 121,125 ****
// set the entry's neighbour interface address
- //COPY_IP(&neigh->addr, &walker->neighbor_iface_addr);
neigh->addr = walker->neighbor_iface_addr;
--- 120,123 ----
***************
*** 164,168 ****
lq_tc->comm.size = 0;
- //COPY_IP(&lq_tc->comm.orig, &olsr_cnf->main_addr);
lq_tc->comm.orig = olsr_cnf->main_addr;
--- 162,165 ----
***************
*** 184,188 ****
lq_tc->comm.seqno = get_msg_seqno();
- //COPY_IP(&lq_tc->from, &olsr_cnf->main_addr);
lq_tc->from = olsr_cnf->main_addr;
--- 181,184 ----
***************
*** 222,226 ****
// set the entry's main address
- //COPY_IP(&neigh->address, &walker->neighbor_main_addr);
neigh->address = walker->neighbor_main_addr;
--- 218,221 ----
Index: neighbor_table.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/src/neighbor_table.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** neighbor_table.c 29 Nov 2007 00:49:38 -0000 1.36
--- neighbor_table.c 29 Nov 2007 18:10:14 -0000 1.37
***************
*** 242,246 ****
/* Set address, willingness and status */
- //COPY_IP(&new_neigh->neighbor_main_addr, main_addr);
new_neigh->neighbor_main_addr = *main_addr;
new_neigh->willingness = WILL_NEVER;
--- 242,245 ----
More information about the Olsr-cvs
mailing list