Revision da14f0cf
Added by Jim Pingle over 12 years ago
| usr/local/www/wizards/traffic_shaper_wizard.inc | ||
|---|---|---|
| 332 | 332 |
$voipfields[] = $field; |
| 333 | 333 |
|
| 334 | 334 |
$field = array(); |
| 335 |
$field['name'] = "Address";
|
|
| 336 |
$enablefields[] = "Address";
|
|
| 335 |
$field['name'] = "Upstream SIP Server";
|
|
| 336 |
$enablefields[] = "Upstream SIP Server";
|
|
| 337 | 337 |
$field['type'] = "inputalias"; |
| 338 |
$field['description'] = "(Optional) If this is chosen, the provider field will be overridden. This allows you to just provide the IP address of the VOIP adaptor to prioritize. NOTE: You can also use a Firewall Alias in this location.";
|
|
| 338 |
$field['description'] = "(Optional) If this is chosen, the provider field will be overridden. This allows you to provide the IP address of the <strong>remote</strong> PBX or SIP Trunk to prioritize. <br />NOTE: You can also use a Firewall Alias in this location.";
|
|
| 339 | 339 |
$field['message'] = "IP Address field is non-blank and doesn't look like an IP address."; |
| 340 | 340 |
$field['bindstofield'] = "ezshaper->step3->address"; |
| 341 | 341 |
$voipfields[] = $field; |
| ... | ... | |
| 1359 | 1359 |
if( is_ipaddr($config['ezshaper']['step3']['address']) || is_alias($config['ezshaper']['step3']['address'])) {
|
| 1360 | 1360 |
/* create VOIP rules */ |
| 1361 | 1361 |
$rule = array(); |
| 1362 |
$rule['type'] = "match";
|
|
| 1362 |
$rule['type'] = "match";
|
|
| 1363 | 1363 |
//$rule['interface'] = $interfacelist; |
| 1364 |
$rule['descr'] = gettext("VOIP Adapter");
|
|
| 1364 |
$rule['descr'] = gettext("Connections From Upstream SIP Server");
|
|
| 1365 | 1365 |
$rule['protocol'] = "udp"; |
| 1366 | 1366 |
$rule['defaultqueue'] = "qVoIP"; |
| 1367 | 1367 |
$rule['source']['address'] = $config['ezshaper']['step3']['address']; |
| ... | ... | |
| 1370 | 1370 |
$rule['wizard'] = "yes"; |
| 1371 | 1371 |
$rule['enabled'] = "on"; |
| 1372 | 1372 |
$config['filter']['rule'][] = $rule; |
| 1373 |
|
|
| 1373 |
|
|
| 1374 |
$rule = array(); |
|
| 1375 |
$rule['type'] = "match"; |
|
| 1376 |
//$rule['interface'] = $interfacelist; |
|
| 1377 |
$rule['descr'] = gettext("Connections To Upstream SIP Server");
|
|
| 1378 |
$rule['protocol'] = "udp"; |
|
| 1379 |
$rule['defaultqueue'] = "qVoIP"; |
|
| 1380 |
$rule['source']['any'] = TRUE; |
|
| 1381 |
$rule['destination']['address'] = $config['ezshaper']['step3']['address']; |
|
| 1382 |
$rule['floating'] = "yes"; |
|
| 1383 |
$rule['wizard'] = "yes"; |
|
| 1384 |
$rule['enabled'] = "on"; |
|
| 1385 |
$config['filter']['rule'][] = $rule; |
|
| 1374 | 1386 |
} elseif( $config['ezshaper']['step3']['provider'] == "Generic" ) {
|
| 1375 | 1387 |
/* create VOIP rules */ |
| 1376 | 1388 |
$rule = array(); |
| usr/local/www/wizards/traffic_shaper_wizard.xml | ||
|---|---|---|
| 115 | 115 |
</options> |
| 116 | 116 |
</field> |
| 117 | 117 |
<field> |
| 118 |
<name>Address</name>
|
|
| 118 |
<name>Upstream SIP Server</name>
|
|
| 119 | 119 |
<type>inputalias</type> |
| 120 |
<description>(Optional) If this is chosen, the provider field will be overridden. This allows you to just provide the IP address of the VOIP adaptor to prioritize. NOTE: You can also use a Firewall Alias in this location.</description>
|
|
| 120 |
<description>(Optional) If this is chosen, the provider field will be overridden. This allows you to provide the IP address of the <strong>remote</strong> PBX or SIP Trunk to prioritize. <br />NOTE: You can also use a Firewall Alias in this location.</description>
|
|
| 121 | 121 |
<bindstofield>ezshaper->step3->address</bindstofield> |
| 122 | 122 |
<message>IP Address field is non-blank and doesn't look like an IP address.</message> |
| 123 | 123 |
</field> |
| usr/local/www/wizards/traffic_shaper_wizard_dedicated.inc | ||
|---|---|---|
| 357 | 357 |
$voipfields[] = $field; |
| 358 | 358 |
|
| 359 | 359 |
$field = array(); |
| 360 |
$field['name'] = "Address";
|
|
| 361 |
$enablefields[] = "Address";
|
|
| 360 |
$field['name'] = "Upstream SIP Server";
|
|
| 361 |
$enablefields[] = "Upstream SIP Server";
|
|
| 362 | 362 |
$field['type'] = "inputalias"; |
| 363 |
$field['description'] = "(Optional) If this is chosen, the provider field will be overridden. This allows you to just provide the IP address of the VOIP adaptor to prioritize. NOTE: You can also use a Firewall Alias in this location.";
|
|
| 363 |
$field['description'] = "(Optional) If this is chosen, the provider field will be overridden. This allows you to provide the IP address of the <strong>remote</strong> PBX or SIP Trunk to prioritize. <br />NOTE: You can also use a Firewall Alias in this location.";
|
|
| 364 | 364 |
$field['message'] = "IP Address field is non-blank and doesn't look like an IP address."; |
| 365 | 365 |
$field['bindstofield'] = "ezshaper->step3->address"; |
| 366 | 366 |
$voipfields[] = $field; |
| ... | ... | |
| 1423 | 1423 |
/* create VOIP rules */ |
| 1424 | 1424 |
$rule = array(); |
| 1425 | 1425 |
$rule['type'] = "match"; |
| 1426 |
//$rule['interface'] = $interfacelist;
|
|
| 1427 |
$rule['descr'] = gettext("VOIP Adapter");
|
|
| 1426 |
//$rule['interface'] = $interfacelist;
|
|
| 1427 |
$rule['descr'] = gettext("Connections From Upstream SIP Server");
|
|
| 1428 | 1428 |
$rule['protocol'] = "udp"; |
| 1429 | 1429 |
$rule['defaultqueue'] = "qVoIP"; |
| 1430 | 1430 |
$rule['source']['address'] = $config['ezshaper']['step3']['address']; |
| ... | ... | |
| 1434 | 1434 |
$rule['enabled'] = "on"; |
| 1435 | 1435 |
$config['filter']['rule'][] = $rule; |
| 1436 | 1436 |
|
| 1437 |
$rule = array(); |
|
| 1438 |
$rule['type'] = "match"; |
|
| 1439 |
//$rule['interface'] = $interfacelist; |
|
| 1440 |
$rule['descr'] = gettext("Connections To Upstream SIP Server");
|
|
| 1441 |
$rule['protocol'] = "udp"; |
|
| 1442 |
$rule['defaultqueue'] = "qVoIP"; |
|
| 1443 |
$rule['source']['any'] = TRUE; |
|
| 1444 |
$rule['destination']['address'] = $config['ezshaper']['step3']['address']; |
|
| 1445 |
$rule['floating'] = "yes"; |
|
| 1446 |
$rule['wizard'] = "yes"; |
|
| 1447 |
$rule['enabled'] = "on"; |
|
| 1448 |
$config['filter']['rule'][] = $rule; |
|
| 1449 |
|
|
| 1437 | 1450 |
} elseif( $config['ezshaper']['step3']['provider'] == "Generic" ) {
|
| 1438 | 1451 |
/* create VOIP rules */ |
| 1439 | 1452 |
$rule = array(); |
| usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml | ||
|---|---|---|
| 120 | 120 |
</options> |
| 121 | 121 |
</field> |
| 122 | 122 |
<field> |
| 123 |
<name>Address</name>
|
|
| 123 |
<name>Upstream SIP Server</name>
|
|
| 124 | 124 |
<type>inputalias</type> |
| 125 |
<description>(Optional) If this is chosen, the provider field will be overridden. This allows you to just provide the IP address of the VOIP adaptor to prioritize. NOTE: You can also use a Firewall Alias in this location.</description>
|
|
| 125 |
<description>(Optional) If this is chosen, the provider field will be overridden. This allows you to provide the IP address of the <strong>remote</strong> PBX or SIP Trunk to prioritize. <br />NOTE: You can also use a Firewall Alias in this location.</description>
|
|
| 126 | 126 |
<bindstofield>ezshaper->step3->address</bindstofield> |
| 127 | 127 |
<message>IP Address field is non-blank and doesn't look like an IP address.</message> |
| 128 | 128 |
</field> |
| usr/local/www/wizards/traffic_shaper_wizard_multi_all.inc | ||
|---|---|---|
| 379 | 379 |
$voipfields[] = $field; |
| 380 | 380 |
|
| 381 | 381 |
$field = array(); |
| 382 |
$field['name'] = "Address";
|
|
| 383 |
$enablefields[] = "Address";
|
|
| 382 |
$field['name'] = "Upstream SIP Server";
|
|
| 383 |
$enablefields[] = "Upstream SIP Server";
|
|
| 384 | 384 |
$field['type'] = "inputalias"; |
| 385 |
$field['description'] = "(Optional) If this is chosen, the provider field will be overridden. This allows you to just provide the IP address of the VOIP adaptor to prioritize. NOTE: You can also use a Firewall Alias in this location.";
|
|
| 385 |
$field['description'] = "(Optional) If this is chosen, the provider field will be overridden. This allows you to provide the IP address of the <strong>remote</strong> PBX or SIP Trunk to prioritize. <br />NOTE: You can also use a Firewall Alias in this location.";
|
|
| 386 | 386 |
$field['message'] = "IP Address field is non-blank and doesn't look like an IP address."; |
| 387 | 387 |
$field['bindstofield'] = "ezshaper->step3->address"; |
| 388 | 388 |
$voipfields[] = $field; |
| ... | ... | |
| 1480 | 1480 |
/* create VOIP rules */ |
| 1481 | 1481 |
$rule = array(); |
| 1482 | 1482 |
$rule['type'] = "match"; |
| 1483 |
//$rule['interface'] = $interfacelist;
|
|
| 1484 |
$rule['descr'] = gettext("VOIP Adapter");
|
|
| 1483 |
//$rule['interface'] = $interfacelist;
|
|
| 1484 |
$rule['descr'] = gettext("Connections From Upstream SIP Server");
|
|
| 1485 | 1485 |
$rule['protocol'] = "udp"; |
| 1486 | 1486 |
$rule['defaultqueue'] = "qVoIP"; |
| 1487 | 1487 |
$rule['source']['address'] = $config['ezshaper']['step3']['address']; |
| ... | ... | |
| 1490 | 1490 |
$rule['wizard'] = "yes"; |
| 1491 | 1491 |
$rule['enabled'] = "on"; |
| 1492 | 1492 |
$config['filter']['rule'][] = $rule; |
| 1493 |
|
|
| 1494 |
$rule = array(); |
|
| 1495 |
$rule['type'] = "match"; |
|
| 1496 |
//$rule['interface'] = $interfacelist; |
|
| 1497 |
$rule['descr'] = gettext("Connections To Upstream SIP Server");
|
|
| 1498 |
$rule['protocol'] = "udp"; |
|
| 1499 |
$rule['defaultqueue'] = "qVoIP"; |
|
| 1500 |
$rule['source']['any'] = TRUE; |
|
| 1501 |
$rule['destination']['address'] = $config['ezshaper']['step3']['address']; |
|
| 1502 |
$rule['floating'] = "yes"; |
|
| 1503 |
$rule['wizard'] = "yes"; |
|
| 1504 |
$rule['enabled'] = "on"; |
|
| 1505 |
$config['filter']['rule'][] = $rule; |
|
| 1493 | 1506 |
|
| 1494 | 1507 |
} elseif( $config['ezshaper']['step3']['provider'] == "Generic" ) {
|
| 1495 | 1508 |
/* create VOIP rules */ |
| usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml | ||
|---|---|---|
| 128 | 128 |
</options> |
| 129 | 129 |
</field> |
| 130 | 130 |
<field> |
| 131 |
<name>Address</name>
|
|
| 131 |
<name>Upstream SIP Server</name>
|
|
| 132 | 132 |
<type>inputalias</type> |
| 133 |
<description>(Optional) If this is chosen, the provider field will be overridden. This allows you to just provide the IP address of the VOIP adaptor to prioritize. NOTE: You can also use a Firewall Alias in this location.</description>
|
|
| 133 |
<description>(Optional) If this is chosen, the provider field will be overridden. This allows you to provide the IP address of the <strong>remote</strong> PBX or SIP Trunk to prioritize. <br />NOTE: You can also use a Firewall Alias in this location.</description>
|
|
| 134 | 134 |
<bindstofield>ezshaper->step3->address</bindstofield> |
| 135 | 135 |
<message>IP Address field is non-blank and doesn't look like an IP address.</message> |
| 136 | 136 |
</field> |
| usr/local/www/wizards/traffic_shaper_wizard_multi_lan.inc | ||
|---|---|---|
| 1221 | 1221 |
/* create VOIP rules */ |
| 1222 | 1222 |
$rule = array(); |
| 1223 | 1223 |
$rule['type'] = "match"; |
| 1224 |
//$rule['interface'] = "wan";
|
|
| 1225 |
$rule['descr'] = gettext("VOIP Adapter");
|
|
| 1224 |
//$rule['interface'] = "wan";
|
|
| 1225 |
$rule['descr'] = gettext("Connections From Upstream SIP Server");
|
|
| 1226 | 1226 |
$rule['protocol'] = "udp"; |
| 1227 | 1227 |
$rule['defaultqueue'] = "qVoIP"; |
| 1228 | 1228 |
$rule['source']['address'] = $config['ezshaper']['step3']['address']; |
| ... | ... | |
| 1232 | 1232 |
$rule['enabled'] = "on"; |
| 1233 | 1233 |
$config['filter']['rule'][] = $rule; |
| 1234 | 1234 |
|
| 1235 |
$rule = array(); |
|
| 1236 |
$rule['type'] = "match"; |
|
| 1237 |
//$rule['interface'] = "wan"; |
|
| 1238 |
$rule['descr'] = gettext("Connections To Upstream SIP Server");
|
|
| 1239 |
$rule['protocol'] = "udp"; |
|
| 1240 |
$rule['defaultqueue'] = "qVoIP"; |
|
| 1241 |
$rule['source']['any'] = TRUE; |
|
| 1242 |
$rule['destination']['address'] = $config['ezshaper']['step3']['address']; |
|
| 1243 |
$rule['floating'] = "yes"; |
|
| 1244 |
$rule['wizard'] = "yes"; |
|
| 1245 |
$rule['enabled'] = "on"; |
|
| 1246 |
$config['filter']['rule'][] = $rule; |
|
| 1247 |
|
|
| 1235 | 1248 |
} elseif( $config['ezshaper']['step3']['provider'] == "Generic" ) {
|
| 1236 | 1249 |
/* create VOIP rules */ |
| 1237 | 1250 |
$rule = array(); |
| usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml | ||
|---|---|---|
| 117 | 117 |
</options> |
| 118 | 118 |
</field> |
| 119 | 119 |
<field> |
| 120 |
<name>Address</name>
|
|
| 120 |
<name>Upstream SIP Server</name>
|
|
| 121 | 121 |
<type>inputalias</type> |
| 122 |
<description>(Optional) If this is chosen, the provider field will be overridden. This allows you to just provide the IP address of the VOIP adaptor to prioritize. NOTE: You can also use a Firewall Alias in this location.</description>
|
|
| 122 |
<description>(Optional) If this is chosen, the provider field will be overridden. This allows you to provide the IP address of the <strong>remote</strong> PBX or SIP Trunk to prioritize. <br />NOTE: You can also use a Firewall Alias in this location.</description>
|
|
| 123 | 123 |
<bindstofield>ezshaper->step3->address</bindstofield> |
| 124 | 124 |
<message>IP Address field is non-blank and doesn't look like an IP address.</message> |
| 125 | 125 |
</field> |
Also available in: Unified diff
Fix wording for VoIP address option in the shaper. Add rule going the other direction to catch connections initiated both ways.