[Olsr-dev] small bugfix

Ferry Huberts (spam-protected)
Wed Aug 1 18:47:36 CEST 2012



On 01-08-12 18:29, hh wrote:
> there is sometimes 30 and 39 in a lot of code-files - i think the 39 is
> the correct one

thinking is not enough.
provide proof of either 30 or 39.

>
> Am 2012-08-01 18:20, schrieb Ferry Huberts:
>> why is this needed?
>>
>> On 01-08-12 18:18, hh wrote:
>>> a small bug-fix for olsrd.git stable-branch - here is my local git log -
>>> is it okay for pushing ?
>>> hh
>>> -----------------------------------------------------------------
>>>
>>> commit 7460b53305e1e0a4f7a019097c4a57f6ce946541
>>> Author: harald <(spam-protected)>
>>> Date:   Wed Aug 1 17:29:25 2012 +0200
>>>
>>>      tc_set.c duplicate_set.c: small bug-fix - case ipv6 - ipwidth
>>> 30-->39
>>>
>>> diff --git a/src/duplicate_set.c b/src/duplicate_set.c
>>> index 78d262c..3d69375 100644
>>> --- a/src/duplicate_set.c
>>> +++ b/src/duplicate_set.c
>>> @@ -198,7 +198,7 @@ olsr_print_duplicate_table(void)
>>>   #ifndef NODEBUG
>>>     /* The whole function makes no sense without it. */
>>>     struct dup_entry *entry;
>>> -  const int ipwidth = olsr_cnf->ip_version == AF_INET ? 15 : 30;
>>> +  const int ipwidth = olsr_cnf->ip_version == AF_INET ? 15 : 39;
>>>     struct ipaddr_str addrbuf;
>>>
>>>     OLSR_PRINTF(1, "\n--- %s
>>> ------------------------------------------------- DUPLICATE SET\n\n"
>>> "%-*s %8s %s\n",
>>> diff --git a/src/tc_set.c b/src/tc_set.c
>>> index 2971195..3c4d1b9 100644
>>> --- a/src/tc_set.c
>>> +++ b/src/tc_set.c
>>> @@ -708,7 +708,7 @@ olsr_print_tc_table(void)
>>>   #ifndef NODEBUG
>>>     /* The whole function makes no sense without it. */
>>>     struct tc_entry *tc;
>>> -  const int ipwidth = olsr_cnf->ip_version == AF_INET ? 15 : 30;
>>> +  const int ipwidth = olsr_cnf->ip_version == AF_INET ? 15 : 39;
>>>
>>>     OLSR_PRINTF(1, "\n--- %s
>>> ------------------------------------------------- TOPOLOGY\n\n" "%-*s
>>> %-*s %-14s  %s\n",
>>>                 olsr_wallclock_string(), ipwidth, "Source IP addr",
>>> ipwidth, "Dest IP addr", "      LQ      ", "ETX");
>>>
>>>
>>
>

-- 
Ferry Huberts




More information about the Olsr-dev mailing list