Revision bd00203a
Added by | src/usr/local/www/firewall_nat.php | ||
|---|---|---|
| 219 | 219 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address($natent['source'], $rdr_srctype_flags)))?>
|
| 220 | 220 |
</a> |
| 221 | 221 |
<?php elseif ($show_system_alias_popup && array_key_exists($natent['source']['network'], $system_alias_specialnet)): ?> |
| 222 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=system_alias_info_popup(strtoupper($natent['source']['network']) . '__NETWORK')?>" data-html="true">
|
|
| 222 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=alias_info_popup(strtoupper($natent['source']['network']) . '__NETWORK', true)?>" data-html="true">
|
|
| 223 | 223 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address($natent['source'], $rdr_srctype_flags)))?>
|
| 224 | 224 |
</a> |
| 225 | 225 |
<?php elseif ($show_system_alias_popup && array_key_exists($natent['source']['address'], $system_aliases_hosts)): ?> |
| 226 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=system_alias_info_popup(strtoupper($natent['source']['address']))?>" data-html="true">
|
|
| 226 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=alias_info_popup(strtolower($natent['source']['address']), true)?>" data-html="true">
|
|
| 227 | 227 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address($natent['source'])))?>
|
| 228 | 228 |
</a> |
| 229 | 229 |
<?php else: ?> |
| ... | ... | |
| 236 | 236 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_port($natent['source']['port'])))?>
|
| 237 | 237 |
</a> |
| 238 | 238 |
<?php elseif ($show_system_alias_popup && array_key_exists($natent['source']['port'], $system_aliases_ports)): ?> |
| 239 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=system_alias_info_popup(strtolower($natent['source']['port']))?>" data-html="true">
|
|
| 239 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=alias_info_popup(strtolower($natent['source']['port']), true)?>" data-html="true">
|
|
| 240 | 240 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_port($natent['source']['port'])))?>
|
| 241 | 241 |
</a> |
| 242 | 242 |
<?php else: ?> |
| ... | ... | |
| 250 | 250 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address($natent['destination'], $rdr_dsttype_flags)))?>
|
| 251 | 251 |
</a> |
| 252 | 252 |
<?php elseif ($show_system_alias_popup && array_key_exists($natent['destination']['network'], $system_alias_specialnet)): ?> |
| 253 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=system_alias_info_popup(strtoupper($natent['destination']['network']) . '__NETWORK')?>" data-html="true">
|
|
| 253 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=alias_info_popup(strtoupper($natent['destination']['network']) . '__NETWORK', true)?>" data-html="true">
|
|
| 254 | 254 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address($natent['destination'], $rdr_dsttype_flags)))?>
|
| 255 | 255 |
</a> |
| 256 | 256 |
<?php elseif ($show_system_alias_popup && array_key_exists($natent['destination']['address'], $system_aliases_hosts)): ?> |
| 257 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=system_alias_info_popup(strtoupper($natent['destination']['address']))?>" data-html="true">
|
|
| 257 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=alias_info_popup(strtolower($natent['destination']['address']), true)?>" data-html="true">
|
|
| 258 | 258 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address($natent['destination'])))?>
|
| 259 | 259 |
</a> |
| 260 | 260 |
<?php else: ?> |
| ... | ... | |
| 267 | 267 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_port($natent['destination']['port'])))?>
|
| 268 | 268 |
</a> |
| 269 | 269 |
<?php elseif ($show_system_alias_popup && array_key_exists($natent['destination']['port'], $system_aliases_ports)): ?> |
| 270 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=system_alias_info_popup(strtolower($natent['destination']['port']))?>" data-html="true">
|
|
| 270 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=alias_info_popup(strtolower($natent['destination']['port']), true)?>" data-html="true">
|
|
| 271 | 271 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_port($natent['destination']['port'])))?>
|
| 272 | 272 |
</a> |
| 273 | 273 |
<?php else: ?> |
| ... | ... | |
| 280 | 280 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address(['network' => $natent['target']], $rdr_lcltype_flags)))?>
|
| 281 | 281 |
</a> |
| 282 | 282 |
<?php elseif ($show_system_alias_popup && array_key_exists($natent['target'], $system_aliases_hosts)): ?> |
| 283 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=system_alias_info_popup(strtolower($natent['target']))?>" data-html="true">
|
|
| 283 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=alias_info_popup(strtolower($natent['target']), true)?>" data-html="true">
|
|
| 284 | 284 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_address(['address' => $natent['target']])))?>
|
| 285 | 285 |
</a> |
| 286 | 286 |
<?php else: ?> |
| ... | ... | |
| 293 | 293 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_port($localport)))?>
|
| 294 | 294 |
</a> |
| 295 | 295 |
<?php elseif ($show_system_alias_popup && array_key_exists($localport, $system_aliases_ports)): ?> |
| 296 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=system_alias_info_popup(strtolower($localport))?>" data-html="true">
|
|
| 296 |
<a data-toggle="popover" data-trigger="hover focus" title="<?=gettext('System alias details')?>" data-content="<?=alias_info_popup(strtolower($localport), true)?>" data-html="true">
|
|
| 297 | 297 |
<?=str_replace('_', '_<wbr>', htmlspecialchars(pprint_port($localport)))?>
|
| 298 | 298 |
</a> |
| 299 | 299 |
<?php else: ?> |
Also available in: Unified diff
Fix rule generation and display for system aliases
This is a followup to 52e512c0555d9f5a91732907e524364358d3f70c
- Update system alias comments and descriptions.
- Improve reserved aliases processing.
- Use alias_info_popup() code when possible for system aliases.
- Handle system port aliases correctly.
- Show the description for dynamically generated system aliases when
the content cannot be determined. Since pf does not support port
tables, dynamic system port aliases always show the description.