24bc419303
This reverts commit a743303211b89bbcf4cea438ee797bbbc7b59e80. Reason for revert: Breaks downstream tests that attempt to call FindHeaderExtensionByUri with 2 arguments. Could you keep the old 2-argument method declaration and just forward the call to the new 3-argument method with a suitable no-op filter? Original change's description: > Fix RTP header extension encryption > > Previously, RTP header extensions with encryption had been filtered > if the encryption had been activated (not the other way around) which > was likely an unintended logic inversion. > > In addition, it ensures that encrypted RTP header extensions are only > negotiated if RTP header extension encryption is turned on. Formerly, > which extensions had been negotiated depended on the order in which > they were inserted, regardless of whether or not header encryption was > actually enabled, leading to no extensions being sent on the wire. > > Further changes: > > - If RTP header encryption enabled, prefer encrypted extensions over > non-encrypted extensions > - Add most extensions to list of extensions supported for encryption > - Discard encrypted extensions in a session description in case encryption > is not supported for that extension > > Note that this depends on https://github.com/cisco/libsrtp/pull/491 to get > into libwebrtc (cherry-pick or bump libsrtp version). Otherwise, two-byte > header extensions will prevent any RTP packets being sent/received. > > Bug: webrtc:11713 > Change-Id: Ia0779453d342fa11e06996d9bc2d3c826f3466d3 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/177980 > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Reviewed-by: Taylor <deadbeef@webrtc.org> > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#33723} TBR=deadbeef@webrtc.org,terelius@webrtc.org,hta@webrtc.org,lennart.grahl@gmail.com Change-Id: I7df6b0fa611c6496dccdfb09a65ff33ae4a52b26 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:11713 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215222 Reviewed-by: Björn Terelius <terelius@webrtc.org> Commit-Queue: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33727}
How to write code in the api/ directory
Mostly, just follow the regular style guide, but:
- Note that
api/code is not exempt from the “.hand.ccfiles come in pairs” rule, so if you declare something inapi/path/to/foo.h, it should be defined inapi/path/to/foo.cc. - Headers in
api/should, if possible, not#includeheaders outsideapi/. It’s not always possible to avoid this, but be aware that it adds to a small mountain of technical debt that we’re trying to shrink. .ccfiles inapi/, on the other hand, are free to#includeheaders outsideapi/.
That is, the preferred way for api/ code to access non-api/ code is to call
it from a .cc file, so that users of our API headers won’t transitively
#include non-public headers.
For headers in api/ that need to refer to non-public types, forward
declarations are often a lesser evil than including non-public header files. The
usual rules still apply, though.
.cc files in api/ should preferably be kept reasonably small. If a
substantial implementation is needed, consider putting it with our non-public
code, and just call it from the api/ .cc file.