Mercurial > hg > anonet-resdb
changeset 583:f5ec84b7d825 draft
restored old resdb from srn and added new changes for tinydns, my git domain, and peer2anonet
| author | d3v11 <d3v11@d3v11.ano> |
|---|---|
| date | Sun, 24 Jul 2011 10:28:13 -0500 |
| parents | 396a4f970840 |
| children | c1a8d314ed43 |
| files | contrib/peer2anonet/README contrib/peer2anonet/peer2anonet db/dom/ano/d3v11/ns/a.ns.d3v11.ano db/usr/d3v11/git db/usr/d3v1150m471c/git |
| diffstat | 5 files changed, 22 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/peer2anonet/README Sun Jul 24 11:55:21 2011 +0000 +++ b/contrib/peer2anonet/README Sun Jul 24 10:28:13 2011 -0500 @@ -16,7 +16,7 @@ nc -l 1337 | peer2anonet # Send a netcat pipe: - nc 192.168.1.0 1337 < autoconfig.txt + nc 1337 192.168.1.0 < autoconfig.txt DESCRIPTION: peer2anonet is an autoconfiguration utility to easily establish a @@ -73,23 +73,14 @@ anon <--your peer's alias 11.22.33.44 <--your peer's remote ip 3.5.7.9 <--your peer's anonet ip +3571 <--your peer's client port 3570 <--your peer's asn 3c6e0b8a9c15224a8228b9a98ca1531d <--your peer's public key ================== Not Actual Line on File ============================ At your discretion, you may exclude the public key from the bottom of an autoconfig file and post installation of your new - peer service, peer2anonet will prompt for it. PLEASE NOTE: - peer2anonet will set client ports for peering as: - - #REMOTE: - 2<last four of your asn>. - - #LOCAL: - 2<last four of your peer's asn>. - - If you need to change the ports, go to: - /services/$PEERNAME/run and change the values. + peer service, peer2anonet will prompt for it. CHANGES: @@ -141,10 +132,10 @@ data pertaining to his/her system in order for you to configure a new peering session, or vice versa. - Thu Jul 14 09:09:07 CDT 2011 - d3v1150m471c - * client local/remote ports simplified using peers' asn's. - see above for details. - + Sun Jul 17 22:21:05 CDT 2011 - d3v11 + * fixed bird.conf bug + * fixed bird protocol bug + * patched security for-loops
--- a/contrib/peer2anonet/peer2anonet Sun Jul 24 11:55:21 2011 +0000 +++ b/contrib/peer2anonet/peer2anonet Sun Jul 24 10:28:13 2011 -0500 @@ -21,12 +21,14 @@ read -p "Enter your peer's name/interface: " PEERNAME read -p "Enter your peer's remote ip: " REMOTEIP read -p "Enter your peer's anonet ip: " PEERIP +read -p "Enter your peer's remote port: " PEERPORT read -p "Enter your peer's asn: " PEERASN read -p "Enter your peer's public key: " PUBKEY ######################################################################### # Do some security checks on variables: TEST[0]=$PEERNAME; TEST[1]=$REMOTEIP; TEST[2]=$PEERIP + TEST[3]=$PEERPORT; TEST[4]=$PEERASN for((X=0;X<=2;X++)); do if [[ $(echo ${TEST[$X]} | tr -d 'a-zA-Z0-9._-' | wc -c) -gt 1 ]]; then @@ -37,11 +39,13 @@ fi done -if [[ $(echo "$PEERASN" | tr -d '0-9' | wc -c) -gt 1 ]]; then - echo "peer2anonet: fatal error: unacceptable data: "$PEERASN" +for((X=3;X<=4;X++)); do +if [[ $(echo ${TEST[$X]} | tr -d '0-9' | wc -c) -gt 1 ]]; then + echo "peer2anonet: fatal error: unacceptable data: ${TEST[$X]} " exit 1 fi +done if [[ $(echo "$PUBKEY" | tr -d 'a-zA-Z0-9' | wc -c) -gt 1 ]]; then echo "peer2anonet: fatal error: unacceptable data: ${TEST[$X]} @@ -50,11 +54,11 @@ fi ADDPORT="2$(($PEERASN % 10000))" -REM_PORT="2$(($P2A_ASN % 10000))" + ######################################################################### # We need to check if base files need to be imported to services for bird: NEW_PROTOCOL=" -protocol bgp $PEERNAME\_bgp { table AnoNet_routes; +protocol bgp $PEERNAME { table AnoNet_routes; local as $P2A_ASN; neighbor $PEERIP as $PEERASN; source address $P2A_IP; @@ -96,7 +100,7 @@ }; protocol static static_AnoNet_routes { table AnoNet_routes; - route $P2A_ROUTE/24 drop; + route $P2A_NET/24 drop; } protocol kernel { @@ -120,6 +124,8 @@ test -e /services/bird/run || echo "$BIRD_RUN" > /services/bird/run chmod +x /services/bird/run echo "$NEW_PROTOCOL" >> /services/bird/bird.conf +test -L /services/bird && rm -r /service/bird +ln -s /servicess/bird /service/ ######################################################################### # We need to check if this peering session already exists: @@ -131,7 +137,7 @@ # Create files to configure the new peering session: echo "#!/bin/sh export REMOTE_ADDRESS=$REMOTEIP -export REMOTE_PORT=$REM_PORT +export REMOTE_PORT=$PEERPORT export LOCAL_PORT=$ADDPORT export PRIVATE_KEY=\"\$(cat seckey)\" export PUBLIC_KEY=$PUBKEY
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/d3v11/ns/a.ns.d3v11.ano Sun Jul 24 10:28:13 2011 -0500 @@ -0,0 +1,1 @@ +1.1.5.153