[quagga-dev 15667] Re: Call for Agenda

2016-06-20 Thread Martin Winter

A little bit late, but I had a long call with Vincent today (his late
monday evening).

He has some different suggestion which I wrote down in a new document as
an alternative choice. (Unfortunately, he can’t attend the call)

Description is here:
https://docs.google.com/document/d/1A0kr7PrlsXs7Xe4btAgVWolvXYF5-JjtSWTOQypGRSs/edit?usp=sharing

Key changes:
- Maintainers are reduced to git committers and can’t make the 
ACK/NACK

  decision.
- Anyone in community can ACK/NACK a patch.
- No ACK: does not go in at all
- Can’t agree: will get pushed to Steering committee for decision
- Dispute resolution is done by a Steering committee which is elected

I hope I got all the details correctly written down in the spirit of how
Vincent explained it to me.

- Martin

Disclaimer: I’m only the person who wrote it down. This does not mean 
that
I agree or disagree on it. But I want this choice to be discussed as 
well.



On 18 Jun 2016, at 14:23, Lou Berger wrote:


On 6/14/2016 12:55 PM, Donald Sharp wrote:
Next Tuesday we have the normal monthly meeting.  If you have 
anything

that you would like to discuss please let me know so I can add it to
the agenda.

I'd like to discuss and vote on the 3 documents:

Maintainer:

https://docs.google.com/document/d/19DZcT0cJUSYxVIFenHvGFhLLUmLTRFHuMNZcI7aUNGA/edit?usp=sharing


I made a few minor changes and comments. The most substantive change I
made was to clarify that missing e-mail votes are the ones that count,
and that it's 3 out of 6 votes is needed to be inactive (3 in a row, 3
out of 4, 3 out of 5, and 3 out of 6 all = inactive).

  It looks good to me (either with or without the changes). I vote yes
(as contributor).


Tools:

https://docs.google.com/document/d/1s_EbbXwqWPmfOg6ArgKmEMm_iv0vwGvJs-7ZG4yFKb4/edit?usp=sharing


I think the document combines a few things together in a few places,
e.g., submission within the code review section.  I suggested some
changes to address this.  I think the topic of submissions via pull
requests is also missing.  From my contributor perspective, I prefer
pull requests makes the most sense, but given where the project is
"vote" for both email patches and pull requests.  Having pull requests
only be mandatory for patch sets seems like a reasonable transition
approach...

This too looks good to me (either with or without the changes). I vote
yes (as contributor).


Quagga Process:

https://docs.google.com/document/d/1xYrpTKYDvK23BCxXP-dbE6nOuvBxbGIilNLfVkI3j-I/edit?usp=sharing


I support this new process.  I tweaked the language related to
confirming meeting decisions on the e-mail list. The main point of the
change is that split decisions (those that are not unanimous across 
all
maintainers)  need to be confirmed on the list and and all decisions 
are

announced on the list.

I'm particularity interested in (and see this as the most important 
part

of the overall discussion):
(a) having an active master branch that reflects the current/living
state of ACK'ed patches
(b) having a predictable release cycle

Lou

PS I'm unlikely to be on the whole call on Tuesday due to an 
unavoidable

conflict -- but I hope the above unambiguously provides my position.


Please take the time to read/discuss.

thanks!

donald


___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev




___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev


___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev

[quagga-dev 15666] Re: ospfd crashes after updating to 1.0.20160315

2016-06-20 Thread Jafar Al-Gharaibeh


On 6/20/2016 5:05 PM, Sergey Popov wrote:

Well, silly me. I look on quagga's cgit and found commit
bb01bdd740339b0c07d8ed0786811801b2a79192, which, i hope, fixes my problem.

Yep, that is the one I had in mind :)



At least 1 hour run for test router with flapping ppp interfaces does
not crash ospfd.


Let me know if you get any further issues related to this.



I have just backported this into Gentoo package, which i maintain,
thanks a lot.

Any chance for making new release soon?


There is some talk about a release but nothing is set yet.



I am not familiar with quagga's release cycle, but for me - it would be
second backport which fixes crashes in recent quagga release(first one
was for RIP, commit 7e7a101dde5969f62074801d84bb4cc75e50f548).

And as i see in git log - some more crash fixes still exists too, i just
did not face with that crashes(yet).
Yes, there are several fixes. There is a discussion within the Quagga 
development community about going for shorter release cycles and 
potentially shorter turn around time for bug fixes. We all hope it 
happens soon.


Cheers,
Jafar



___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev


[quagga-dev 15665] Re: ospfd crashes after updating to 1.0.20160315

2016-06-20 Thread Sergey Popov
Well, silly me. I look on quagga's cgit and found commit
bb01bdd740339b0c07d8ed0786811801b2a79192, which, i hope, fixes my problem.

At least 1 hour run for test router with flapping ppp interfaces does
not crash ospfd.

I have just backported this into Gentoo package, which i maintain,
thanks a lot.

Any chance for making new release soon?

I am not familiar with quagga's release cycle, but for me - it would be
second backport which fixes crashes in recent quagga release(first one
was for RIP, commit 7e7a101dde5969f62074801d84bb4cc75e50f548).

And as i see in git log - some more crash fixes still exists too, i just
did not face with that crashes(yet).

21.06.2016 00:49, Jafar Al-Gharaibeh пишет:
> Sergey,
> 
>   Can you also post zebra.conf?
> 
>   In any case, this might be related to a bug that have been fixed
> recently, but not 100% sure. Can you build Quagga from the latest
> sources? just checkout master, build, and see if that fixes the issue,
> and let us know how it goes.
> 
> --Jafar
>  
> On 6/20/2016 3:25 PM, Sergey Popov wrote:
>> Able to reproduce this on smaller setup
>>
>> My ospfd conf: https://bpaste.net/show/171b3a5dadd1
>> ospfd.log with debug options enabled(warning - >600Kb of text):
>> https://bpaste.net/show/dd70ace5f819
>>
>> It happens almost every time(but not exactly every time and that's
>> strange) when i remove one of the interfaces, that is responsible for
>> generating summarized route(for example by killing pppd process).
>>
>> Maybe some race condition with null pointer dereference happens?
>>
>> 21.04.2016 18:57, Jafar Al-Gharaibeh пишет:
>>> Hi Sergey,
>>>
>>>   Do you have the log file for ospfd with various debugging options enabled?
>>>
>>>debug ospfd [packet|ism|nsm|zebra|lsa]
>>>
>>> Thanks,
>>> Jafar
>>>
>>> On 4/21/2016 10:30 AM, Sergey Popov wrote:
 Hi, guys.

 After updating Quagga from 0.99.24.1 to 1.0.20160315 i am expirience
 constant crashing of ospfd.

 I am using Hardened Gentoo with PaX-enabled kernel(not sure if it is
 causing the crash or not)

 I tried to reproduce crash on simple setups(only one area and couple of
 interface, also on Hardened Gentoo) and i could not do it.

 Here is crash log:

 2016/04/21 18:04:06 OSPF: Assertion `next_state != 0' failed in file
 ospf_nsm.c, line 800, function ospf_nsm_event
 2016/04/21 18:04:06 OSPF: Backtrace for 18 stack frames:
 2016/04/21 18:04:06 OSPF: [bt 0]
 /usr/lib64/libzebra.so.0(zlog_backtrace+0x42) [0x373716a3b87]
 2016/04/21 18:04:06 OSPF: [bt 1]
 /usr/lib64/libzebra.so.0(_zlog_assert_failed+0x101) [0x373716a4876]
 2016/04/21 18:04:06 OSPF: [bt 2]
 /usr/lib64/libospf.so.0(ospf_nsm_event+0x2ec) [0x37371913150]
 2016/04/21 18:04:06 OSPF: [bt 3]
 /usr/lib64/libzebra.so.0(thread_call+0xe2) [0x3737168bf40]
 2016/04/21 18:04:06 OSPF: [bt 4]
 /usr/lib64/libzebra.so.0(funcname_thread_execute+0xca) [0x3737168c1df]
 2016/04/21 18:04:06 OSPF: [bt 5]
 /usr/lib64/libospf.so.0(ospf_if_cleanup+0x1a4) [0x3737190b333]
 2016/04/21 18:04:06 OSPF: [bt 6] /usr/lib64/libospf.so.0(+0x29be0)
 [0x3737190fbe0]
 2016/04/21 18:04:06 OSPF: [bt 7]
 /usr/lib64/libospf.so.0(ospf_ism_event+0x7a) [0x3737191001d]
 2016/04/21 18:04:06 OSPF: [bt 8]
 /usr/lib64/libzebra.so.0(thread_call+0xe2) [0x3737168bf40]
 2016/04/21 18:04:06 OSPF: [bt 9]
 /usr/lib64/libzebra.so.0(funcname_thread_execute+0xca) [0x3737168c1df]
 2016/04/21 18:04:06 OSPF: [bt 10]
 /usr/lib64/libospf.so.0(ospf_if_down+0x73) [0x3737190cd03]
 2016/04/21 18:04:06 OSPF: [bt 11]
 /usr/lib64/libospf.so.0(ospf_if_free+0x38) [0x3737190b46d]
 2016/04/21 18:04:06 OSPF: [bt 12] /usr/lib64/libospf.so.0(+0x21ea4)
 [0x37371907ea4]
 2016/04/21 18:04:06 OSPF: [bt 13] /usr/lib64/libzebra.so.0(+0x547ab)
 [0x373716ae7ab]
 2016/04/21 18:04:06 OSPF: [bt 14]
 /usr/lib64/libzebra.so.0(thread_call+0xe2) [0x3737168bf40]
 2016/04/21 18:04:06 OSPF: [bt 15] /usr/sbin/ospfd(+0x1e51) [0x3c40878e51]
 2016/04/21 18:04:06 OSPF: [bt 16]
 /lib64/libc.so.6(__libc_start_main+0x114) [0x373712d09e4]
 2016/04/21 18:04:06 OSPF: [bt 17] /usr/sbin/ospfd(+0x1769) [0x3c40878769]
 2016/04/21 18:04:06 OSPF: Current thread function ospf_nsm_event,
 scheduled from file ospf_interface.c, line 283


 If you need entire ospfd.conf to debug this problem, feel free to ask
 it. For now i can say that it is someway complicated setup - 6 areas
 with MD5 authentication and export filters, 28 neighbors.
>>
>>
>>
>> ___
>> Quagga-dev mailing list
>> Quagga-dev@lists.quagga.net
>> https://lists.quagga.net/mailman/listinfo/quagga-dev
> 
> 
> 
> ___
> Quagga-dev mailing list
> Quagga-dev@lists.quagga.net
> https://lists.quagga.net/mailman/listinfo/quagga-dev
> 


-- 
Best regards, Sergey Popov
Gentoo developer
Gentoo 

[quagga-dev 15664] Re: ospfd crashes after updating to 1.0.20160315

2016-06-20 Thread Jafar Al-Gharaibeh

Sergey,

  Can you also post zebra.conf?

  In any case, this might be related to a bug that have been fixed 
recently, but not 100% sure. Can you build Quagga from the latest 
sources? just checkout master, build, and see if that fixes the issue, 
and let us know how it goes.


--Jafar

On 6/20/2016 3:25 PM, Sergey Popov wrote:

Able to reproduce this on smaller setup

My ospfd conf: https://bpaste.net/show/171b3a5dadd1
ospfd.log with debug options enabled(warning - >600Kb of text):
https://bpaste.net/show/dd70ace5f819

It happens almost every time(but not exactly every time and that's
strange) when i remove one of the interfaces, that is responsible for
generating summarized route(for example by killing pppd process).

Maybe some race condition with null pointer dereference happens?

21.04.2016 18:57, Jafar Al-Gharaibeh пишет:

Hi Sergey,

   Do you have the log file for ospfd with various debugging options enabled?

debug ospfd [packet|ism|nsm|zebra|lsa]

Thanks,
Jafar

On 4/21/2016 10:30 AM, Sergey Popov wrote:

Hi, guys.

After updating Quagga from 0.99.24.1 to 1.0.20160315 i am expirience
constant crashing of ospfd.

I am using Hardened Gentoo with PaX-enabled kernel(not sure if it is
causing the crash or not)

I tried to reproduce crash on simple setups(only one area and couple of
interface, also on Hardened Gentoo) and i could not do it.

Here is crash log:

2016/04/21 18:04:06 OSPF: Assertion `next_state != 0' failed in file
ospf_nsm.c, line 800, function ospf_nsm_event
2016/04/21 18:04:06 OSPF: Backtrace for 18 stack frames:
2016/04/21 18:04:06 OSPF: [bt 0]
/usr/lib64/libzebra.so.0(zlog_backtrace+0x42) [0x373716a3b87]
2016/04/21 18:04:06 OSPF: [bt 1]
/usr/lib64/libzebra.so.0(_zlog_assert_failed+0x101) [0x373716a4876]
2016/04/21 18:04:06 OSPF: [bt 2]
/usr/lib64/libospf.so.0(ospf_nsm_event+0x2ec) [0x37371913150]
2016/04/21 18:04:06 OSPF: [bt 3]
/usr/lib64/libzebra.so.0(thread_call+0xe2) [0x3737168bf40]
2016/04/21 18:04:06 OSPF: [bt 4]
/usr/lib64/libzebra.so.0(funcname_thread_execute+0xca) [0x3737168c1df]
2016/04/21 18:04:06 OSPF: [bt 5]
/usr/lib64/libospf.so.0(ospf_if_cleanup+0x1a4) [0x3737190b333]
2016/04/21 18:04:06 OSPF: [bt 6] /usr/lib64/libospf.so.0(+0x29be0)
[0x3737190fbe0]
2016/04/21 18:04:06 OSPF: [bt 7]
/usr/lib64/libospf.so.0(ospf_ism_event+0x7a) [0x3737191001d]
2016/04/21 18:04:06 OSPF: [bt 8]
/usr/lib64/libzebra.so.0(thread_call+0xe2) [0x3737168bf40]
2016/04/21 18:04:06 OSPF: [bt 9]
/usr/lib64/libzebra.so.0(funcname_thread_execute+0xca) [0x3737168c1df]
2016/04/21 18:04:06 OSPF: [bt 10]
/usr/lib64/libospf.so.0(ospf_if_down+0x73) [0x3737190cd03]
2016/04/21 18:04:06 OSPF: [bt 11]
/usr/lib64/libospf.so.0(ospf_if_free+0x38) [0x3737190b46d]
2016/04/21 18:04:06 OSPF: [bt 12] /usr/lib64/libospf.so.0(+0x21ea4)
[0x37371907ea4]
2016/04/21 18:04:06 OSPF: [bt 13] /usr/lib64/libzebra.so.0(+0x547ab)
[0x373716ae7ab]
2016/04/21 18:04:06 OSPF: [bt 14]
/usr/lib64/libzebra.so.0(thread_call+0xe2) [0x3737168bf40]
2016/04/21 18:04:06 OSPF: [bt 15] /usr/sbin/ospfd(+0x1e51) [0x3c40878e51]
2016/04/21 18:04:06 OSPF: [bt 16]
/lib64/libc.so.6(__libc_start_main+0x114) [0x373712d09e4]
2016/04/21 18:04:06 OSPF: [bt 17] /usr/sbin/ospfd(+0x1769) [0x3c40878769]
2016/04/21 18:04:06 OSPF: Current thread function ospf_nsm_event,
scheduled from file ospf_interface.c, line 283


If you need entire ospfd.conf to debug this problem, feel free to ask
it. For now i can say that it is someway complicated setup - 6 areas
with MD5 authentication and export filters, 28 neighbors.




___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev


___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev

[quagga-dev 15663] Re: ospfd crashes after updating to 1.0.20160315

2016-06-20 Thread Sergey Popov
Able to reproduce this on smaller setup

My ospfd conf: https://bpaste.net/show/171b3a5dadd1
ospfd.log with debug options enabled(warning - >600Kb of text):
https://bpaste.net/show/dd70ace5f819

It happens almost every time(but not exactly every time and that's
strange) when i remove one of the interfaces, that is responsible for
generating summarized route(for example by killing pppd process).

Maybe some race condition with null pointer dereference happens?

21.04.2016 18:57, Jafar Al-Gharaibeh пишет:
> Hi Sergey,
> 
>   Do you have the log file for ospfd with various debugging options enabled?
> 
>debug ospfd [packet|ism|nsm|zebra|lsa]
> 
> Thanks,
> Jafar
> 
> On 4/21/2016 10:30 AM, Sergey Popov wrote:
>> Hi, guys.
>>
>> After updating Quagga from 0.99.24.1 to 1.0.20160315 i am expirience
>> constant crashing of ospfd.
>>
>> I am using Hardened Gentoo with PaX-enabled kernel(not sure if it is
>> causing the crash or not)
>>
>> I tried to reproduce crash on simple setups(only one area and couple of
>> interface, also on Hardened Gentoo) and i could not do it.
>>
>> Here is crash log:
>>
>> 2016/04/21 18:04:06 OSPF: Assertion `next_state != 0' failed in file
>> ospf_nsm.c, line 800, function ospf_nsm_event
>> 2016/04/21 18:04:06 OSPF: Backtrace for 18 stack frames:
>> 2016/04/21 18:04:06 OSPF: [bt 0]
>> /usr/lib64/libzebra.so.0(zlog_backtrace+0x42) [0x373716a3b87]
>> 2016/04/21 18:04:06 OSPF: [bt 1]
>> /usr/lib64/libzebra.so.0(_zlog_assert_failed+0x101) [0x373716a4876]
>> 2016/04/21 18:04:06 OSPF: [bt 2]
>> /usr/lib64/libospf.so.0(ospf_nsm_event+0x2ec) [0x37371913150]
>> 2016/04/21 18:04:06 OSPF: [bt 3]
>> /usr/lib64/libzebra.so.0(thread_call+0xe2) [0x3737168bf40]
>> 2016/04/21 18:04:06 OSPF: [bt 4]
>> /usr/lib64/libzebra.so.0(funcname_thread_execute+0xca) [0x3737168c1df]
>> 2016/04/21 18:04:06 OSPF: [bt 5]
>> /usr/lib64/libospf.so.0(ospf_if_cleanup+0x1a4) [0x3737190b333]
>> 2016/04/21 18:04:06 OSPF: [bt 6] /usr/lib64/libospf.so.0(+0x29be0)
>> [0x3737190fbe0]
>> 2016/04/21 18:04:06 OSPF: [bt 7]
>> /usr/lib64/libospf.so.0(ospf_ism_event+0x7a) [0x3737191001d]
>> 2016/04/21 18:04:06 OSPF: [bt 8]
>> /usr/lib64/libzebra.so.0(thread_call+0xe2) [0x3737168bf40]
>> 2016/04/21 18:04:06 OSPF: [bt 9]
>> /usr/lib64/libzebra.so.0(funcname_thread_execute+0xca) [0x3737168c1df]
>> 2016/04/21 18:04:06 OSPF: [bt 10]
>> /usr/lib64/libospf.so.0(ospf_if_down+0x73) [0x3737190cd03]
>> 2016/04/21 18:04:06 OSPF: [bt 11]
>> /usr/lib64/libospf.so.0(ospf_if_free+0x38) [0x3737190b46d]
>> 2016/04/21 18:04:06 OSPF: [bt 12] /usr/lib64/libospf.so.0(+0x21ea4)
>> [0x37371907ea4]
>> 2016/04/21 18:04:06 OSPF: [bt 13] /usr/lib64/libzebra.so.0(+0x547ab)
>> [0x373716ae7ab]
>> 2016/04/21 18:04:06 OSPF: [bt 14]
>> /usr/lib64/libzebra.so.0(thread_call+0xe2) [0x3737168bf40]
>> 2016/04/21 18:04:06 OSPF: [bt 15] /usr/sbin/ospfd(+0x1e51) [0x3c40878e51]
>> 2016/04/21 18:04:06 OSPF: [bt 16]
>> /lib64/libc.so.6(__libc_start_main+0x114) [0x373712d09e4]
>> 2016/04/21 18:04:06 OSPF: [bt 17] /usr/sbin/ospfd(+0x1769) [0x3c40878769]
>> 2016/04/21 18:04:06 OSPF: Current thread function ospf_nsm_event,
>> scheduled from file ospf_interface.c, line 283
>>
>>
>> If you need entire ospfd.conf to debug this problem, feel free to ask
>> it. For now i can say that it is someway complicated setup - 6 areas
>> with MD5 authentication and export filters, 28 neighbors.


-- 
Best regards, Sergey Popov
Gentoo developer
Gentoo Desktop-effects project lead
Gentoo Quality Assurance project lead



signature.asc
Description: OpenPGP digital signature
___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev

[quagga-dev 15662] CI Testresult: PASSED (Re: [quagga-dev, 15660] zebra: Change bitwise operations to purpose-built macros)

2016-06-20 Thread cisystem
Continous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF CI System 

This is an EXPERIMENTAL automated CI system.
For questions and feedback, feel free to email
Martin Winter .

Patches applied :
  Patchwork 2009: http://patchwork.quagga.net/patch/2009
   [quagga-dev,15660] zebra: Change bitwise operations to purpose-built 
macros
Tested on top of Git : 5f67888 (as of 20160429.234845 UTC)
CI System Testrun URL: https://ci1.netdef.org/browse/QUAGGA-QPWORK-322/


Regards,
  NetDEF/OpenSourceRouting Continous Integration (CI) System

---
OpenSourceRouting.org is a project of the Network Device Education Foundation,
For more information, see www.netdef.org and www.opensourcerouting.org
For questions in regards to this CI System, contact Martin Winter, 
mwin...@netdef.org

___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev


[quagga-dev 15661] Re: [PATCH] zebra: Change bitwise operations to purpose-built macros

2016-06-20 Thread Jafar Al-Gharaibeh

Acked-by: Jafar Al-Gharaibeh 

On 6/20/2016 12:58 PM, Quentin Young wrote:

Some bitfields for zebra_debug_* flags were being modified
with bitwise operators instead of the purpose-built macros
in lib/zebra.h. Changed such instances to use the macros.

Signed-off-by: Quentin Young 
---
  zebra/debug.c | 20 ++--
  1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/zebra/debug.c b/zebra/debug.c
index 537c476..1004c95 100644
--- a/zebra/debug.c
+++ b/zebra/debug.c
@@ -97,8 +97,8 @@ DEFUN (debug_zebra_packet,
 "Debug option set for zebra packet\n")
  {
zebra_debug_packet = ZEBRA_DEBUG_PACKET;
-  zebra_debug_packet |= ZEBRA_DEBUG_SEND;
-  zebra_debug_packet |= ZEBRA_DEBUG_RECV;
+  SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
+  SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
return CMD_SUCCESS;
  }
  
@@ -113,11 +113,11 @@ DEFUN (debug_zebra_packet_direct,

  {
zebra_debug_packet = ZEBRA_DEBUG_PACKET;
if (strncmp ("send", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet |= ZEBRA_DEBUG_SEND;
+SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet |= ZEBRA_DEBUG_RECV;
+SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
if (strncmp ("detail", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet |= ZEBRA_DEBUG_DETAIL;
+SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_DETAIL);
return CMD_SUCCESS;
  }
  
@@ -133,10 +133,10 @@ DEFUN (debug_zebra_packet_detail,

  {
zebra_debug_packet = ZEBRA_DEBUG_PACKET;
if (strncmp ("send", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet |= ZEBRA_DEBUG_SEND;
+SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet |= ZEBRA_DEBUG_RECV;
-  zebra_debug_packet |= ZEBRA_DEBUG_DETAIL;
+SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
+  SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_DETAIL);
return CMD_SUCCESS;
  }
  
@@ -220,9 +220,9 @@ DEFUN (no_debug_zebra_packet_direct,

 "Debug option set for send packet\n")
  {
if (strncmp ("send", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet &= ~ZEBRA_DEBUG_SEND;
+UNSET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet &= ~ZEBRA_DEBUG_RECV;
+UNSET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
return CMD_SUCCESS;
  }
  



___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev


[quagga-dev 15660] [PATCH] zebra: Change bitwise operations to purpose-built macros

2016-06-20 Thread Quentin Young
Some bitfields for zebra_debug_* flags were being modified
with bitwise operators instead of the purpose-built macros
in lib/zebra.h. Changed such instances to use the macros.

Signed-off-by: Quentin Young 
---
 zebra/debug.c | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/zebra/debug.c b/zebra/debug.c
index 537c476..1004c95 100644
--- a/zebra/debug.c
+++ b/zebra/debug.c
@@ -97,8 +97,8 @@ DEFUN (debug_zebra_packet,
"Debug option set for zebra packet\n")
 {
   zebra_debug_packet = ZEBRA_DEBUG_PACKET;
-  zebra_debug_packet |= ZEBRA_DEBUG_SEND;
-  zebra_debug_packet |= ZEBRA_DEBUG_RECV;
+  SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
+  SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
   return CMD_SUCCESS;
 }
 
@@ -113,11 +113,11 @@ DEFUN (debug_zebra_packet_direct,
 {
   zebra_debug_packet = ZEBRA_DEBUG_PACKET;
   if (strncmp ("send", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet |= ZEBRA_DEBUG_SEND;
+SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
   if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet |= ZEBRA_DEBUG_RECV;
+SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
   if (strncmp ("detail", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet |= ZEBRA_DEBUG_DETAIL;
+SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_DETAIL);
   return CMD_SUCCESS;
 }
 
@@ -133,10 +133,10 @@ DEFUN (debug_zebra_packet_detail,
 {
   zebra_debug_packet = ZEBRA_DEBUG_PACKET;
   if (strncmp ("send", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet |= ZEBRA_DEBUG_SEND;
+SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
   if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet |= ZEBRA_DEBUG_RECV;
-  zebra_debug_packet |= ZEBRA_DEBUG_DETAIL;
+SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
+  SET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_DETAIL);
   return CMD_SUCCESS;
 }
 
@@ -220,9 +220,9 @@ DEFUN (no_debug_zebra_packet_direct,
"Debug option set for send packet\n")
 {
   if (strncmp ("send", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet &= ~ZEBRA_DEBUG_SEND;
+UNSET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_SEND);
   if (strncmp ("recv", argv[0], strlen (argv[0])) == 0)
-zebra_debug_packet &= ~ZEBRA_DEBUG_RECV;
+UNSET_FLAG(zebra_debug_packet, ZEBRA_DEBUG_RECV);
   return CMD_SUCCESS;
 }
 
-- 
2.1.4


___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev


[quagga-dev 15659] Re: [PATCH ] bgpd: use default index table for vpnv4 when called from vty

2016-06-20 Thread Jafar Al-Gharaibeh

Submitted by Christian Franke a few days ago. See patch 1988.

What is the action taken for duplicate/identical patches. Nack, so that 
they can be easily identified and dropped?


--Jafar

On 6/20/2016 3:35 AM, Philippe Guibert wrote:

For vpnv4, RIB is reachable through safi index set to SAFI_MPLS_VPN,
whereas value entered through vty was SAFI_MPLS_LABELED_VPN. The value
to be used for parsing RIB is SAFI_MPLS_VPN.

Signed-off-by: Philippe Guibert 
---
  bgpd/bgp_route.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index c364372f8bf7..2fd16751aa3b 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -11848,7 +11848,7 @@ bgp_table_stats_vty (struct vty *vty, const char *name,
safi = SAFI_UNICAST;
break;
case 'v':
-   safi =  SAFI_MPLS_LABELED_VPN;
+   safi =  SAFI_MPLS_VPN;
break;
case 'e':
safi = SAFI_ENCAP;



___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev


[quagga-dev 15658] CI Testresult: PASSED (Re: [quagga-dev, 15657] bgpd: use default index table for vpnv4 when called from vty)

2016-06-20 Thread cisystem
Continous Integration Result: SUCCESSFUL

Congratulations, this patch passed basic tests

Tested-by: NetDEF CI System 

This is an EXPERIMENTAL automated CI system.
For questions and feedback, feel free to email
Martin Winter .

Patches applied :
  Patchwork 2008: http://patchwork.quagga.net/patch/2008
   [quagga-dev,15657] bgpd: use default index table for vpnv4 when called 
from vty
Tested on top of Git : 5f67888 (as of 20160429.234845 UTC)
CI System Testrun URL: https://ci1.netdef.org/browse/QUAGGA-QPWORK-321/


Regards,
  NetDEF/OpenSourceRouting Continous Integration (CI) System

---
OpenSourceRouting.org is a project of the Network Device Education Foundation,
For more information, see www.netdef.org and www.opensourcerouting.org
For questions in regards to this CI System, contact Martin Winter, 
mwin...@netdef.org

___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev


[quagga-dev 15655] Re: [PATCH 10/10] bgpd: add L3/L2VPN Virtual Network Control feature

2016-06-20 Thread Philippe Guibert
On Fri, Jun 17, 2016 at 4:10 PM, Lou Berger  wrote:

Hello Lou,


>> #if ENABLE_BGP_VNC
>> if (v != RD_TYPE_VNC_ETH)
>>v |= (u_int16_t) *pnt;
>> #else
>> v |= (u_int16_t) *pnt;
>> #endif
>>
>> IMHO, I think this brings more clarity about the algorithm in place.
> I considered this, but I hate duplicate code so came down on the other
> side.  But I was on the fence, so will make this change.
>
If i can bring an argument between the two writings.
The clarity is brought by the extra spaces located just before v|=.
That indentation makes the code rewiew  clearer.

Regards,

Philippe

___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev


[quagga-dev 15656] Re: [PATCH 10/10] bgpd: add L3/L2VPN Virtual Network Control feature

2016-06-20 Thread Philippe Guibert
On Fri, Jun 17, 2016 at 7:31 PM, Lou Berger  wrote:

Lou,


> BTW V3 has the references you asked for in the log.
>
> *
> https://github.com/LabNConsulting/quagga-vnc/tree/patches/R1.0.20160315%2Bvnc/v3
>
Just read the changes. Thanks a lot.

Acked-by: Philippe Guibert 

___
Quagga-dev mailing list
Quagga-dev@lists.quagga.net
https://lists.quagga.net/mailman/listinfo/quagga-dev