[asterisk-dev] [Code Review] 3317: pjsip: TOS/DSCP phase 2: Introduce DSCP equivalents to tos/tos_audio/tos_video and deprecate the existing tos options.

[Jonathan Rose]

-----------------------------------------------------------
This is an automatically generated e-mail. To reply, visit:
https://reviewboard.asterisk.org/r/3317/
-----------------------------------------------------------

(Updated March 7, 2014, 5:51 p.m.)


Review request for Asterisk Developers, George Joseph, Joshua Colp, and Matt Jordan.


Changes
-------

Fix a bug where sorcery object representations in transports aren't included when the DSCP value was used.


Bugs: ASTERISK-23235
    https://issues.asterisk.org/jira/browse/ASTERISK-23235


Repository: Asterisk


Description
-------

Introduces new options for transports and endpoints
transport/dscp - DSCP equivalent to tos option. If input numerically, this is treated as a DSCP value and not as a TOS value.
endpoint/dscp_audio - Same for tos_audio endpoint option
endpoint/dscp_video - Same for tos_video endpoint option

Deprecates all the above TOS options.  They still work and the input for them still functions the same.

If a string representation is used for either TOS or DSCP settings (e.g. AF21, CS1, etc) then it doesn't matter which option is used. Both should be interpreted correctly.

Output of these fields in sorcery object representations will only show DSCP values now. If type has a name, the name is used.  If it would be 'unknown' instead, then the numerical value will be used.

Alembic scripts are updated to include the dscp fields. The equivalent tos fields are left alone.
This patch also fixes an issue where two alembic revisions were upgrades from the same revision. This was a result of merging the patch that changed the TOS field types in phase 1.


Diffs (updated)
-----

  /trunk/res/res_pjsip/pjsip_configuration.c 410043 
  /trunk/res/res_pjsip/config_transport.c 410202 
  /trunk/res/res_pjsip.c 410202 
  /trunk/main/acl.c 410202 
  /trunk/include/asterisk/res_pjsip.h 410202 
  /trunk/include/asterisk/acl.h 410202 
  /trunk/contrib/ast-db-manage/config/versions/4c573e7135bd_fix_tos_field_types.py 410202 

Diff: https://reviewboard.asterisk.org/r/3317/diff/


Testing
-------

Checked numerous TOS and DSCP values for equivalence and their output.
Ran upgrade and downgrade against alembic scripts from a fresh database
Created testsuite modifications for tests that are currently checking TOS values. Right now those tests will fail if this patch is applied.


Thanks,

Jonathan Rose

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-dev/attachments/20140307/f5809f8d/attachment-0001.html>