sipwise
/
www_admin
mirror of https://github.com/sipwise/www_admin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

add transport protocol select to peers (admin interface)

Browse Source
3.4
Andrew Pogrebennyk 13 years ago
parent 3fe0a69b9d
commit 2f9e996b3a
2 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File

4
lib/admin/Controller/peering.pm
Unescape View File

@ -377,6 +377,7 @@ sub create_peer : Local {
my $ip = $c->request->params->{ip};
my $host = length($c->request->params->{host}) ? $c->request->params->{host} : undef;
my $port = $c->request->params->{port};
my $transport = $c->request->params->{transport};
my $weight = $c->request->params->{weight};
#TODO: add syntax checks here
@ -393,6 +394,7 @@ sub create_peer : Local {
ip => $ip,
host => $host,
port => $port,
transport => $transport,
weight => $weight,
},
},
@ -477,6 +479,7 @@ sub edit_peer : Local {
my $ip = $c->request->params->{ip};
my $host = length($c->request->params->{host}) ? $c->request->params->{host} : undef;
my $port = $c->request->params->{port};
my $transport = $c->request->params->{transport};
my $weight = $c->request->params->{weight};
# $messages{crulerr} = 'Client.Syntax.MalformedPeerGroupName'
@ -490,6 +493,7 @@ sub edit_peer : Local {
ip => $ip,
host => $host,
port => $port,
transport => $transport,
weight => $weight,
},
},

62
root/tt/peering_detail.tt
Unescape View File

@ -13,10 +13,11 @@
<ul class="cleanlist">
<li class="ui-state-default">
<div class="span-4">Name</div>
<div class="span-4">IP Address</div>
<div class="span-4">Hostname</div>
<div class="span-3">IP Address</div>
<div class="span-3">Hostname</div>
<div class="span-2">Port</div>
<div class="span-2 last">Weight</div>
<div class="span-2">Protocol</div>
<div class="span-1 last">Weight</div>
</li>
[% id = 0 %]
[% FOREACH peer = grp.peers %]
@ -26,21 +27,28 @@
<input type="hidden" name="grpid" value="[% grp.group.id %]" />
<input type="hidden" name="peerid" value="[% peer.id %]" />
<div class="span-4">
<input type="text" size="14 id="addtxt" title="string, peer name"
<input type="text" size="10 id="addtxt" title="string, peer name"
name="name" value="[% peer.name %]" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, peer ip address"
<div class="span-3">
<input type="text" size="10" id="addtxt" title="string, peer ip address"
name="ip" value="[% peer.ip %]" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, peer hostname (optional)"
<div class="span-3">
<input type="text" size="10" id="addtxt" title="string, peer hostname (optional)"
name="host" value="[% peer.host %]" />
</div>
<div class="span-2">
<input type="text" size="5" id="addtxt" title="int, peer port (1-65535)"
<input type="text" size="2" id="addtxt" title="int, peer port (1-65535)"
name="port" value="[% peer.port %]" />
</div>
<div class="span-2">
<select size="1" name="transport" title="Transport protocol (UDP, TCP, TLS)">
<option value="UDP" [% IF peer.transport == 'UDP' %]selected="selected"[% END %]>UDP</option>
<option value="TCP" [% IF peer.transport == 'TCP' %]selected="selected"[% END %]>TCP</option>
<option value="TLS" [% IF peer.transport == 'TLS' %]selected="selected"[% END %]>TLS</option>
</select>
</div>
<div class="span-1">
<input type="text" size="1" id="addtxt" title="int, peer weight (0-255)"
name="weight" value="[% peer.weight %]" />
@ -54,9 +62,10 @@
</div>
[% ELSE %]
<div class="span-4"><a href="/peering/preferences?peerid=[% peer.id%]" class="aaction">[% peer.name %]</a></div>
<div class="span-4">[% peer.ip %]</div>
<div class="span-4">[% peer.host %]</div>
<div class="span-3">[% peer.ip %]</div>
<div class="span-3">[% peer.host %]</div>
<div class="span-2">[% peer.port %]</div>
<div class="span-2">[% peer.transport %]</div>
<div class="span-1">[% peer.weight %]</div>
<div class="span-1">
[% UNLESS Catalyst.session.admin.read_only %]
@ -81,21 +90,28 @@
<form action="/peering/create_peer" method="post">
<input type="hidden" name="grpid" value="[% grp.group.id %]" />
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, peer name"
<input type="text" size="10" id="addtxt" title="string, peer name"
name="name" value="" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, peer ip address"
<div class="span-3">
<input type="text" size="10" id="addtxt" title="string, peer ip address"
name="ip" value="" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, peer hostname (optional)"
<div class="span-3">
<input type="text" size="10" id="addtxt" title="string, peer hostname (optional)"
name="host" value="" />
</div>
<div class="span-2">
<input type="text" size="5" id="addtxt" title="int, peer port (1-65535)"
<input type="text" size="2" id="addtxt" title="int, peer port (1-65535)"
name="port" value="5060" />
</div>
<div class="span-2">
<select size="1" name="transport" title="Transport protocol (UDP, TCP, TLS)">
<option value="UDP" [% IF peer.transport == 'UDP' %]selected="selected"[% END %]>UDP</option>
<option value="TCP" [% IF peer.transport == 'TCP' %]selected="selected"[% END %]>TCP</option>
<option value="TLS" [% IF peer.transport == 'TLS' %]selected="selected"[% END %]>TLS</option>
</select>
</div>
<div class="span-1">
<input type="text" size="1" id="addtxt" title="int, peer weight (0-255)"
name="weight" value="1" />
@ -139,15 +155,15 @@
<input type="hidden" name="grpid" value="[% grp.group.id %]" />
<input type="hidden" name="ruleid" value="[% rule.id %]" />
<div class="span-4">
<input type="text" size="14 id="addtxt" title="string, callee prefix"
<input type="text" size="10 id="addtxt" title="string, callee prefix"
name="callee_prefix" value="[% rule.callee_prefix %]" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, callee pattern"
<input type="text" size="10" id="addtxt" title="string, callee pattern"
name="callee_pattern" value="[% rule.callee_pattern %]" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, caller pattern"
<input type="text" size="10" id="addtxt" title="string, caller pattern"
name="caller_pattern" value="[% rule.caller_pattern %]" />
</div>
<div class="span-3">
@ -189,15 +205,15 @@
<form action="/peering/create_rule" method="post">
<input type="hidden" name="grpid" value="[% grp.group.id %]" />
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, callee prefix"
<input type="text" size="10" id="addtxt" title="string, callee prefix"
name="callee_prefix" value="" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, callee pattern"
<input type="text" size="10" id="addtxt" title="string, callee pattern"
name="callee_pattern" value="" />
</div>
<div class="span-4">
<input type="text" size="14" id="addtxt" title="string, caller pattern"
<input type="text" size="10" id="addtxt" title="string, caller pattern"
name="caller_pattern" value="" />
</div>
<div class="span-3">

Write Preview
Loading…
Cancel
Save