Author: marek Date: 2009-12-03 03:29:56 +0000 (Thu, 03 Dec 2009) New Revision: 1490

Modified: trunk/batman-adv-kernelland/originator.c Log: Updating orig_str for debug

--===============1664300015== Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3V7upXqbjpZ4EhLz" Content-Disposition: inline

--3V7upXqbjpZ4EhLz Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable

In commit 1488 the orig_str has been removed from purge_orig_neighbours(). Apparently, this breaks compilation when enabling debug-flags, as bat_dbg() is expecting this variable as a parameter. Actually, this variable has never been initialised also before commit 1488 (which was probably the reason for mistakenly removing it). This tiny patch adds the orig_str again, but initialises it now as well.

Signed-off-by: Linus Luessing linus.luessing@web.de

Modified: trunk/batman-adv-kernelland/originator.c =================================================================== --- trunk/batman-adv-kernelland/originator.c 2009-11-28 20:11:09 UTC (rev 1489) +++ trunk/batman-adv-kernelland/originator.c 2009-12-03 03:29:56 UTC (rev 1490) @@ -163,7 +163,7 @@ struct neigh_node **best_neigh_node) { struct list_head *list_pos, *list_pos_tmp; - char neigh_str[ETH_STR_LEN]; + char neigh_str[ETH_STR_LEN], orig_str[ETH_STR_LEN]; struct neigh_node *neigh_node; bool neigh_purged = false;

@@ -179,6 +179,7 @@ ((PURGE_TIMEOUT * HZ) / 1000)))) {

addr_to_string(neigh_str, neigh_node->addr); + addr_to_string(orig_str, orig_node->orig); bat_dbg(DBG_BATMAN, "Neighbour timeout: originator %s, neighbour: %s, last_valid %lu\n", orig_str, neigh_str, (neigh_node->last_valid / HZ));

neigh_purged = true;