Make traffic shaping work when WPR chooses the server ports.

replay.py

 #!/usr/bin/env python
 # Copyright 2010 Google Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ skipping 133 matching lines @@
         host=host, port=options.port, **options.shaping_http)
     if options.ssl:
       server_manager.Append(
           httpproxy.HttpsProxyServer,
           archive_fetch, custom_handlers, options.certfile,
           host=host, port=options.ssl_port, **options.shaping_http)
 
 
 def AddTrafficShaper(server_manager, options, host):
   if options.shaping_dummynet:
-    ssl_port = options.ssl_shaping_port if options.ssl else None
-    kwargs = dict(
-        host=host, port=options.shaping_port, ssl_port=ssl_port,
-        dns_port=options.dns_shaping_port,
+    server_manager.AppendTrafficShaper(
+        trafficshaper.TrafficShaper, host=host,
         use_loopback=not options.server_mode and host == '127.0.0.1',
         **options.shaping_dummynet)
-    if not options.dns_forwarding:
-      kwargs['dns_port'] = None
-    server_manager.Append(trafficshaper.TrafficShaper, **kwargs)
 
 
 class OptionsWrapper(object):
   """Add checks, updates, and methods to option values.
 
   Example:
     options, args = option_parser.parse_args()
     options = OptionsWrapper(options, option_parser)  # run checks and updates
     if options.record and options.HasTrafficShaping():
        [...]
@@ skipping 70 matching lines @@
     return kwargs
 
   def _MassageValues(self):
     """Set options that depend on the values of other options."""
     if self.append and not self.record:
       self._options.record = True
     if self.net:
       self._options.down, self._options.up, self._options.delay_ms = \
           net_configs.GetNetConfig(self.net)
       self._nondefaults.update(['down', 'up', 'delay_ms'])
-    if not self.shaping_port:
-      self._options.shaping_port = self.port
-    if not self.ssl_shaping_port:
-      self._options.ssl_shaping_port = self.ssl_port
-    if not self.dns_shaping_port:
-      self._options.dns_shaping_port = self.dns_port
     if not self.ssl:
       self._options.certfile = None
     self.shaping_dns = self._ShapingKeywordArgs('dns')
     self.shaping_http = self._ShapingKeywordArgs('http')
     self.shaping_dummynet = self._ShapingKeywordArgs('dummynet')
 
   def __getattr__(self, name):
     """Make the original option values available."""
     return getattr(self._options, name)
 
@@ skipping 238 matching lines @@
       type='int',
       help='Port number to listen on.')
   harness_group.add_option('--ssl_port', default=443,
       action='store',
       type='int',
       help='SSL port number to listen on.')
   harness_group.add_option('--dns_port', default=53,
       action='store',
       type='int',
       help='DNS port number to listen on.')
-  harness_group.add_option('--shaping_port', default=None,
-      action='store',
-      type='int',
-      help='Port on which to apply traffic shaping.  Defaults to the '
-           'listen port (--port)')
-  harness_group.add_option('--ssl_shaping_port', default=None,
-      action='store',
-      type='int',
-      help='SSL port on which to apply traffic shaping.  Defaults to the '
-           'SSL listen port (--ssl_port)')
-  harness_group.add_option('--dns_shaping_port', default=None,
-      action='store',
-      type='int',
-      help='DNS port on which to apply traffic shaping.  Defaults to the '
-           'DNS listen port (--dns_port)')
   harness_group.add_option('-c', '--certfile', default=None,
       action='store',
       type='string',
       help='Certificate file to use with SSL (gets auto-generated if needed).')
   harness_group.add_option('--no-ssl', default=True,
       action='store_false',
       dest='ssl',
       help='Do not setup an SSL proxy.')
   option_parser.add_option_group(harness_group)
   harness_group.add_option('--no-admin-check', default=True,
@@ skipping 17 matching lines @@
   elif len(args) != 1:
     option_parser.error('Must specify a replay_file')
   else:
     replay_filename = args[0]
 
   return replay(options, replay_filename)
 
 
 if __name__ == '__main__':
   sys.exit(main())