| OLD | NEW |
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
| 2 # Copyright 2010 Google Inc. All Rights Reserved. | 2 # Copyright 2010 Google Inc. All Rights Reserved. |
| 3 # | 3 # |
| 4 # Licensed under the Apache License, Version 2.0 (the "License"); | 4 # Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 # you may not use this file except in compliance with the License. | 5 # you may not use this file except in compliance with the License. |
| 6 # You may obtain a copy of the License at | 6 # You may obtain a copy of the License at |
| 7 # | 7 # |
| 8 # http://www.apache.org/licenses/LICENSE-2.0 | 8 # http://www.apache.org/licenses/LICENSE-2.0 |
| 9 # | 9 # |
| 10 # Unless required by applicable law or agreed to in writing, software | 10 # Unless required by applicable law or agreed to in writing, software |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 | 177 |
| 178 def _delete_rules(self, ipfw_list=None): | 178 def _delete_rules(self, ipfw_list=None): |
| 179 if ipfw_list is None: | 179 if ipfw_list is None: |
| 180 ipfw_list = platformsettings.ipfw('list') | 180 ipfw_list = platformsettings.ipfw('list') |
| 181 existing_rules = set( | 181 existing_rules = set( |
| 182 r.split()[0].lstrip('0') for r in ipfw_list.splitlines()) | 182 r.split()[0].lstrip('0') for r in ipfw_list.splitlines()) |
| 183 delete_rules = [r for r in (self._DOWNLOAD_RULE, self._UPLOAD_RULE) | 183 delete_rules = [r for r in (self._DOWNLOAD_RULE, self._UPLOAD_RULE) |
| 184 if r in existing_rules] | 184 if r in existing_rules] |
| 185 if delete_rules: | 185 if delete_rules: |
| 186 platformsettings.ipfw('delete', *delete_rules) | 186 platformsettings.ipfw('delete', *delete_rules) |
| OLD | NEW |