Revision 48e5f32d proto/ospf/hello.c

View differences:

proto/ospf/hello.c
61 61

  
62 62
  struct ospf_hello_packet *ps = (void *) ps_i;
63 63

  
64
  OSPF_TRACE(D_PACKETS, "HELLO packet received from %I via %s%s", faddr,
65
      (ifa->type == OSPF_IT_VLINK ? "vlink-" : ""), ifa->iface->name);
64
  OSPF_TRACE(D_PACKETS, "HELLO packet received from %I via %s", faddr, ifa->ifname);
66 65

  
67 66
#ifdef OSPFv2
68 67
  ip_addr mask = ps->netmask;
......
120 119

  
121 120
      if (!nn && ifa->strictnbma)
122 121
      {
123
	log(L_WARN "Ignoring new neighbor: %I on %s", faddr,
124
	    ifa->iface->name);
122
	log(L_WARN "Ignoring new neighbor: %I on %s", faddr, ifa->ifname);
125 123
	return;
126 124
      }
127 125

  
......
129 127
	  (((ps->priority == 0) && nn->eligible) ||
130 128
	   ((ps->priority > 0) && !nn->eligible)))
131 129
      {
132
	log(L_ERR "Eligibility mismatch for neighbor: %I on %s",
133
	    faddr, ifa->iface->name);
130
	log(L_ERR "Eligibility mismatch for neighbor: %I on %s", faddr, ifa->ifname);
134 131
	return;
135 132
      }
136 133

  
......
138 135
	nn->found = 1;
139 136
    }
140 137

  
141
    OSPF_TRACE(D_EVENTS, "New neighbor found: %I on %s", faddr,
142
	       ifa->iface->name);
138
    OSPF_TRACE(D_EVENTS, "New neighbor found: %I on %s", faddr, ifa->ifname);
143 139

  
144 140
    n = ospf_neighbor_new(ifa);
145 141

  
......
263 259

  
264 260
  p = (struct proto *) (ifa->oa->po);
265 261
  DBG("%s: Hello/Poll timer fired on interface %s with IP %I\n",
266
      p->name, ifa->iface->name, ifa->addr->ip);
262
      p->name, ifa->ifname, ifa->addr->ip);
267 263

  
268 264
  /* Now we should send a hello packet */
269 265
  pkt = ospf_tx_buffer(ifa);
......
309 305
    u32 *pp = (u32 *) (((u8 *) pkt) + sizeof(struct ospf_hello_packet));
310 306
    WALK_LIST(neigh, ifa->neigh_list)
311 307
    {
312
      if ((i+1) * sizeof(u32) + sizeof(struct ospf_hello_packet) > ospf_pkt_bufsize(ifa))
308
      if ((i+1) * sizeof(u32) + sizeof(struct ospf_hello_packet) > ospf_pkt_maxsize(ifa))
313 309
      {
314
	log(L_WARN "%s: Too many neighbors on interface %s", p->name, ifa->iface->name);
310
	log(L_WARN "%s: Too many neighbors on interface %s", p->name, ifa->ifname);
315 311
	break;
316 312
      }
317 313
      *(pp + i) = htonl(neigh->rid);
......
376 372
    bug("Bug in ospf_hello_send()");
377 373
  }
378 374

  
379
  OSPF_TRACE(D_PACKETS, "HELLO packet sent via %s%s",
380
	     (ifa->type == OSPF_IT_VLINK ? "vlink-" : ""), ifa->iface->name);
375
  OSPF_TRACE(D_PACKETS, "HELLO packet sent via %s", ifa->ifname);
381 376
}

Also available in: Unified diff