[asterisk-commits] mjordan: testsuite/asterisk/trunk r6237 - in /asterisk/trunk/tests/hep: rtcp-...

SVN commits to the Asterisk project asterisk-commits at lists.digium.com
Sun Jan 11 20:10:50 CST 2015


Author: mjordan
Date: Sun Jan 11 20:10:48 2015
New Revision: 6237

URL: http://svnview.digium.com/svn/testsuite?view=rev&rev=6237
Log:
tests/hep/rtcp-{receiver|sender} - fix IP address matching

Our IP address verification uses an IPv4 regex, which, let's face it, is pretty
bad. (There's even a comment in there that it's kind of bad.) Ideally, we
wouldn't use a regex - although for our purposes - which is just to ensure that
we get an IP address - it *usually* is good enough. Unfortunately, the regex
for the last octet assumed there could be no '0' in the value, which is not
exactly what we want.

This patch updates the tests regex for the IP address for the last octet. If
the IP address of the build agents ends up containing a '0', we'll have to go
with a more explicit handler in the Python.

Modified:
    asterisk/trunk/tests/hep/rtcp-receiver/test-config.yaml
    asterisk/trunk/tests/hep/rtcp-sender/test-config.yaml

Modified: asterisk/trunk/tests/hep/rtcp-receiver/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/hep/rtcp-receiver/test-config.yaml?view=diff&rev=6237&r1=6236&r2=6237
==============================================================================
--- asterisk/trunk/tests/hep/rtcp-receiver/test-config.yaml (original)
+++ asterisk/trunk/tests/hep/rtcp-receiver/test-config.yaml Sun Jan 11 20:10:48 2015
@@ -62,8 +62,8 @@
             # for why this is a terrible idea. Really, all we care about is that:
             # (a) we have something in the src/dst addr fields
             # (b) that something is not 0.0.0.0
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
             protocol_type: 5
             capture_agent_id: 1
             ip_id: 17
@@ -84,50 +84,50 @@
         -
             ip_family: 2
             uuid: 'PJSIP/ast2-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 1
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      ssrc: "\\d.*",
-                      type: 200,
-                      report_blocks: [],
-                      report_count: 0
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast2-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 1
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      ssrc: "\\d.*",
-                      type: 200,
-                      report_blocks: [],
-                      report_count: 0
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast2-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 1
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      ssrc: "\\d.*",
+                      type: 200,
+                      report_blocks: [],
+                      report_count: 0
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast2-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 1
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      ssrc: "\\d.*",
+                      type: 200,
+                      report_blocks: [],
+                      report_count: 0
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast2-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
             protocol_type: 5
             capture_agent_id: 1
             ip_id: 17
@@ -148,29 +148,29 @@
         -
             ip_family: 2
             uuid: 'PJSIP/ast2-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 1
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      ssrc: "\\d.*",
-                      type: 200,
-                      report_blocks: [],
-                      report_count: 0
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast2-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 1
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      ssrc: "\\d.*",
+                      type: 200,
+                      report_blocks: [],
+                      report_count: 0
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast2-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
             protocol_type: 5
             capture_agent_id: 1
             ip_id: 17
@@ -203,8 +203,8 @@
             # for why this is a terrible idea. Really, all we care about is that:
             # (a) we have something in the src/dst addr fields
             # (b) that something is not 0.0.0.0
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
             protocol_type: 5
             capture_agent_id: 2
             ip_id: 17
@@ -226,29 +226,29 @@
         -
             ip_family: 2
             uuid: 'PJSIP/ast1-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 2
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      ssrc: "\\d.*",
-                      type: 200,
-                      report_blocks: [],
-                      report_count: 0
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast1-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 2
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      ssrc: "\\d.*",
+                      type: 200,
+                      report_blocks: [],
+                      report_count: 0
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast1-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
             protocol_type: 5
             capture_agent_id: 2
             ip_id: 17
@@ -270,29 +270,29 @@
         -
             ip_family: 2
             uuid: 'PJSIP/ast1-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 2
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      ssrc: "\\d.*",
-                      type: 200,
-                      report_blocks: [],
-                      report_count: 0
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast1-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 2
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      ssrc: "\\d.*",
+                      type: 200,
+                      report_blocks: [],
+                      report_count: 0
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast1-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
             protocol_type: 5
             capture_agent_id: 2
             ip_id: 17
@@ -314,8 +314,8 @@
         -
             ip_family: 2
             uuid: 'PJSIP/ast1-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
             protocol_type: 5
             capture_agent_id: 2
             ip_id: 17

Modified: asterisk/trunk/tests/hep/rtcp-sender/test-config.yaml
URL: http://svnview.digium.com/svn/testsuite/asterisk/trunk/tests/hep/rtcp-sender/test-config.yaml?view=diff&rev=6237&r1=6236&r2=6237
==============================================================================
--- asterisk/trunk/tests/hep/rtcp-sender/test-config.yaml (original)
+++ asterisk/trunk/tests/hep/rtcp-sender/test-config.yaml Sun Jan 11 20:10:48 2015
@@ -60,143 +60,143 @@
             # for why this is a terrible idea. Really, all we care about is that:
             # (a) we have something in the src/dst addr fields
             # (b) that something is not 0.0.0.0
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 1
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { ssrc: "\\d.*",
-                      type: 200,
-                      sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      report_blocks:[ { source_ssrc: "\\d.*",
-                                        highest_seq_no: "\\d.*",
-                                        fraction_lost: 0,
-                                        ia_jitter: "\\d.*",
-                                        packets_lost: 0,
-                                        lsr: "\\d.*",
-                                        dlsr: "\\d.*" }, ],
-                      report_count: 1,
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast2-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 1
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { ssrc: "\\d.*",
-                      type: 200,
-                      sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      report_blocks:[ { source_ssrc: "\\d.*",
-                                        highest_seq_no: "\\d.*",
-                                        fraction_lost: 0,
-                                        ia_jitter: "\\d.*",
-                                        packets_lost: 0,
-                                        lsr: "\\d.*",
-                                        dlsr: "\\d.*" }, ],
-                      report_count: 1,
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast2-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 1
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { ssrc: "\\d.*",
-                      type: 200,
-                      sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      report_blocks:[ { source_ssrc: "\\d.*",
-                                        highest_seq_no: "\\d.*",
-                                        fraction_lost: 0,
-                                        ia_jitter: "\\d.*",
-                                        packets_lost: 0,
-                                        lsr: "\\d.*",
-                                        dlsr: "\\d.*" }, ],
-                      report_count: 1,
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast2-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 1
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { ssrc: "\\d.*",
-                      type: 200,
-                      sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      report_blocks:[ { source_ssrc: "\\d.*",
-                                        highest_seq_no: "\\d.*",
-                                        fraction_lost: 0,
-                                        ia_jitter: "\\d.*",
-                                        packets_lost: 0,
-                                        lsr: "\\d.*",
-                                        dlsr: "\\d.*" }, ],
-                      report_count: 1,
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast2-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 1
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { ssrc: "\\d.*",
-                      type: 200,
-                      sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      report_blocks:[ { source_ssrc: "\\d.*",
-                                        highest_seq_no: "\\d.*",
-                                        fraction_lost: 0,
-                                        ia_jitter: "\\d.*",
-                                        packets_lost: 0,
-                                        lsr: "\\d.*",
-                                        dlsr: "\\d.*" }, ],
-                      report_count: 1,
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast2-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 1
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { ssrc: "\\d.*",
+                      type: 200,
+                      sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      report_blocks:[ { source_ssrc: "\\d.*",
+                                        highest_seq_no: "\\d.*",
+                                        fraction_lost: 0,
+                                        ia_jitter: "\\d.*",
+                                        packets_lost: 0,
+                                        lsr: "\\d.*",
+                                        dlsr: "\\d.*" }, ],
+                      report_count: 1,
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast2-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 1
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { ssrc: "\\d.*",
+                      type: 200,
+                      sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      report_blocks:[ { source_ssrc: "\\d.*",
+                                        highest_seq_no: "\\d.*",
+                                        fraction_lost: 0,
+                                        ia_jitter: "\\d.*",
+                                        packets_lost: 0,
+                                        lsr: "\\d.*",
+                                        dlsr: "\\d.*" }, ],
+                      report_count: 1,
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast2-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 1
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { ssrc: "\\d.*",
+                      type: 200,
+                      sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      report_blocks:[ { source_ssrc: "\\d.*",
+                                        highest_seq_no: "\\d.*",
+                                        fraction_lost: 0,
+                                        ia_jitter: "\\d.*",
+                                        packets_lost: 0,
+                                        lsr: "\\d.*",
+                                        dlsr: "\\d.*" }, ],
+                      report_count: 1,
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast2-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 1
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { ssrc: "\\d.*",
+                      type: 200,
+                      sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      report_blocks:[ { source_ssrc: "\\d.*",
+                                        highest_seq_no: "\\d.*",
+                                        fraction_lost: 0,
+                                        ia_jitter: "\\d.*",
+                                        packets_lost: 0,
+                                        lsr: "\\d.*",
+                                        dlsr: "\\d.*" }, ],
+                      report_count: 1,
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast2-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 1
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { ssrc: "\\d.*",
+                      type: 200,
+                      sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      report_blocks:[ { source_ssrc: "\\d.*",
+                                        highest_seq_no: "\\d.*",
+                                        fraction_lost: 0,
+                                        ia_jitter: "\\d.*",
+                                        packets_lost: 0,
+                                        lsr: "\\d.*",
+                                        dlsr: "\\d.*" }, ],
+                      report_count: 1,
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast2-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
             protocol_type: 5
             capture_agent_id: 1
             ip_id: 17
@@ -233,143 +233,143 @@
             # for why this is a terrible idea. Really, all we care about is that:
             # (a) we have something in the src/dst addr fields
             # (b) that something is not 0.0.0.0
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 2
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { ssrc: "\\d.*",
-                      type: 200,
-                      sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      report_blocks:[ { source_ssrc: "\\d.*",
-                                        highest_seq_no: "\\d.*",
-                                        fraction_lost: 0,
-                                        ia_jitter: "\\d.*",
-                                        packets_lost: 0,
-                                        lsr: "\\d.*",
-                                        dlsr: "\\d.*" }, ],
-                      report_count: 1,
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast1-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 2
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { ssrc: "\\d.*",
-                      type: 200,
-                      sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      report_blocks:[ { source_ssrc: "\\d.*",
-                                        highest_seq_no: "\\d.*",
-                                        fraction_lost: 0,
-                                        ia_jitter: "\\d.*",
-                                        packets_lost: 0,
-                                        lsr: "\\d.*",
-                                        dlsr: "\\d.*" }, ],
-                      report_count: 1,
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast1-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 2
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { ssrc: "\\d.*",
-                      type: 200,
-                      sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      report_blocks:[ { source_ssrc: "\\d.*",
-                                        highest_seq_no: "\\d.*",
-                                        fraction_lost: 0,
-                                        ia_jitter: "\\d.*",
-                                        packets_lost: 0,
-                                        lsr: "\\d.*",
-                                        dlsr: "\\d.*" }, ],
-                      report_count: 1,
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast1-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 2
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { ssrc: "\\d.*",
-                      type: 200,
-                      sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      report_blocks:[ { source_ssrc: "\\d.*",
-                                        highest_seq_no: "\\d.*",
-                                        fraction_lost: 0,
-                                        ia_jitter: "\\d.*",
-                                        packets_lost: 0,
-                                        lsr: "\\d.*",
-                                        dlsr: "\\d.*" }, ],
-                      report_count: 1,
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast1-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            protocol_type: 5
-            capture_agent_id: 2
-            ip_id: 17
-            payload:
-                decode: 'RTCP'
-                value:
-                    { ssrc: "\\d.*",
-                      type: 200,
-                      sender_information: { ntp_timestamp_sec: "\\d.*",
-                                            packets: "\\d.*",
-                                            ntp_timestamp_usec: "\\d.*",
-                                            octets: "\\d.*",
-                                            rtp_timestamp: "\\d.*", },
-                      report_blocks:[ { source_ssrc: "\\d.*",
-                                        highest_seq_no: "\\d.*",
-                                        fraction_lost: 0,
-                                        ia_jitter: "\\d.*",
-                                        packets_lost: 0,
-                                        lsr: "\\d.*",
-                                        dlsr: "\\d.*" }, ],
-                      report_count: 1,
-                    }
-        -
-            ip_family: 2
-            uuid: 'PJSIP/ast1-00000000'
-            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
-            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[1-9]{1,3}'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 2
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { ssrc: "\\d.*",
+                      type: 200,
+                      sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      report_blocks:[ { source_ssrc: "\\d.*",
+                                        highest_seq_no: "\\d.*",
+                                        fraction_lost: 0,
+                                        ia_jitter: "\\d.*",
+                                        packets_lost: 0,
+                                        lsr: "\\d.*",
+                                        dlsr: "\\d.*" }, ],
+                      report_count: 1,
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast1-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 2
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { ssrc: "\\d.*",
+                      type: 200,
+                      sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      report_blocks:[ { source_ssrc: "\\d.*",
+                                        highest_seq_no: "\\d.*",
+                                        fraction_lost: 0,
+                                        ia_jitter: "\\d.*",
+                                        packets_lost: 0,
+                                        lsr: "\\d.*",
+                                        dlsr: "\\d.*" }, ],
+                      report_count: 1,
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast1-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 2
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { ssrc: "\\d.*",
+                      type: 200,
+                      sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      report_blocks:[ { source_ssrc: "\\d.*",
+                                        highest_seq_no: "\\d.*",
+                                        fraction_lost: 0,
+                                        ia_jitter: "\\d.*",
+                                        packets_lost: 0,
+                                        lsr: "\\d.*",
+                                        dlsr: "\\d.*" }, ],
+                      report_count: 1,
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast1-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 2
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { ssrc: "\\d.*",
+                      type: 200,
+                      sender_information: { ntp_timestamp_sec: "\\d.*",
+                                            packets: "\\d.*",
+                                            ntp_timestamp_usec: "\\d.*",
+                                            octets: "\\d.*",
+                                            rtp_timestamp: "\\d.*", },
+                      report_blocks:[ { source_ssrc: "\\d.*",
+                                        highest_seq_no: "\\d.*",
+                                        fraction_lost: 0,
+                                        ia_jitter: "\\d.*",
+                                        packets_lost: 0,
+                                        lsr: "\\d.*",
+                                        dlsr: "\\d.*" }, ],
+                      report_count: 1,
+                    }
+        -
+            ip_family: 2
+            uuid: 'PJSIP/ast1-00000000'
+            src_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            dst_addr: '[1-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}.[0-9]{1,3}'
+            protocol_type: 5
+            capture_agent_id: 2
+            ip_id: 17
+            payload:
+                decode: 'RTCP'
+                value:
+                    { ssrc: "\\d.*",
+                      type: 200,

[... 23 lines stripped ...]



More information about the asterisk-commits mailing list