Asi for upstream avb next #88
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ar and applicant states
… of MSRP domain attribute
…re in parse_app_state()
Previous behavior was for mrpd to emit an error message if an rIn! event was ever sent to the registrar state machine. This change silently ignores the rIn! event in the registrar state machine.
…ds magic numbers in the code)
Conflicts (resolved): daemons/mrpd/mrp.c examples/mrp_client/mrpdhelper.c
…butes are in the database
…end every XXX_txpdu()
…onse and PDelay response follow up messages
This commit moves rLA! processing to before vector event processing. Additionally, LeaveAll is still propagated when num values is 0. LeaveAll is only applied to attributes having the vector's attribute type.
…ransition from LV to MT.
1) mrp_lvatimer_fsm() explicitly returns tx_request (LVA_TIMER event is the only evt that cares). 2) Add MRP_EVENT_SLA. sLA processing the same as rLA with the exception that mrp_lvatimer_fsm() is not run. If mrp_lvatimer_fsm() was run, the lvatimer S/M would transition to PASSIVE and a tx! would then fail to set lva.tx. 3) When mrp_lvatimer_fsm() returns tx_request, an sLA event is generated. 4) lva.sdnmsg was never used, so don't set it in mrp_lvatimer_fsm() 5) Add code to support translating !tx to !txLA when LeaveAll is set. Fixes missing domain LVA pdus. 6) change LVATIMER event to emit pdu without waiting for join timer to expire. 7) MSRP: move reset of send_empty_LeaveAll_flag from msrp_emit_domainvectors() to msrp_txpdu()
…ting listener attrib
…e from AskingFailed unless TalkerID is valid.
Renamed typedef structure to avoid a conflict with a member name.
…again This reverts commit 56fe6e7.
…compile again" This reverts commit 05a61c0.
This reverts commit ab865f6.
Conflicts: daemons/gptp/common/avbts_port.hpp daemons/gptp/common/ieee1588.hpp daemons/gptp/common/ieee1588clock.cpp daemons/gptp/common/ieee1588port.cpp daemons/gptp/common/ptp_message.cpp daemons/mrpd/mmrp.c daemons/mrpd/mrp.c daemons/mrpd/mrp.h daemons/mrpd/mrpd.c daemons/mrpd/msrp.c daemons/mrpd/mvrp.c examples/mrp_client/mrpValidate.c Conflicts have been corrected.
…in emit_vectors function
…ctors with LVA flags set in a single PDU.
…x'd PDU."" This reverts commit d3918a0.
…ute when protocol version is 0
This version does not expect both mediaclk and talker streams to be running from the start of the capture.
|
Large pull request awaiting review! Plan will be to leave this up for feedback for about a week.
|
|
I read all entries one by one, and left my comments inline. I read most of the code outside git and discussed with Andrew already. From my point of view, this pull request can be merged. It would be good though to have someone else also reviewing it. |
added 2 commits
September 24, 2014 09:37
…to mrpdhelper_to_string()
andrew-elder
pushed a commit
that referenced
this pull request
Sep 25, 2014
AudioScience MRP updates
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Many changes to MRP implementation.