# HG changeset patch # User d3v1150m471c # Date 1310652773 18000 # Node ID 09cf0812d89d6e728954ce989b74b8d1032492f4 # Parent eb1bdc46a401fd6f787d3bb20cbd585c2fa0e7f1 peer2anonet: simplified client local/remote ports using asn numbers. diff -r eb1bdc46a401 -r 09cf0812d89d contrib/peer2anonet/README --- a/contrib/peer2anonet/README Thu Jul 14 00:16:56 2011 -0500 +++ b/contrib/peer2anonet/README Thu Jul 14 09:12:53 2011 -0500 @@ -73,7 +73,6 @@ 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 ============================ @@ -81,13 +80,15 @@ 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 YOUR local port for peering as: + peer2anonet will set client ports for peering as: + #REMOTE: + 2. + + #LOCAL: 2. - Therefore, send them the remote port as above, and vice versa. - This helps later when networking to easily identify and debug - problems. If you need to change the ports, go to: + If you need to change the ports, go to: /services/$PEERNAME/run and change the values. @@ -140,6 +141,9 @@ 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. diff -r eb1bdc46a401 -r 09cf0812d89d contrib/peer2anonet/peer2anonet --- a/contrib/peer2anonet/peer2anonet Thu Jul 14 00:16:56 2011 -0500 +++ b/contrib/peer2anonet/peer2anonet Thu Jul 14 09:12:53 2011 -0500 @@ -21,14 +21,12 @@ 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 @@ -39,9 +37,8 @@ fi done -for((X=4;X<=5;X++)); do -if [[ $(echo ${TEST[$X]} | tr -d '0-9' | wc -c) -gt 1 ]]; then - echo "peer2anonet: fatal error: unacceptable data: ${TEST[$X]} +if [[ $(echo "$PEERASN" | tr -d '0-9' | wc -c) -gt 1 ]]; then + echo "peer2anonet: fatal error: unacceptable data: "$PEERASN" " exit 1 fi @@ -54,7 +51,7 @@ 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=" @@ -135,7 +132,7 @@ # Create files to configure the new peering session: echo "#!/bin/sh export REMOTE_ADDRESS=$REMOTEIP -export REMOTE_PORT=$PEERPORT +export REMOTE_PORT=$REM_PORT export LOCAL_PORT=$ADDPORT export PRIVATE_KEY=\"\$(cat seckey)\" export PUBLIC_KEY=$PUBKEY