Changeset 5809 in genesis


Ignore:
Timestamp:
Dec 27, 2007, 12:24:41 PM (17 years ago)
Author:
lodewijk
Message:
  • nieuwe node AJSoft2
  • prutsen aan LivingLab
  • maak getrange.py wat minder kieskeurig
Location:
nodes
Files:
3 edited
1 copied

Legend:

Unmodified
Added
Removed

  • nodes/CNodeAJSoft2/wleiden.conf

    r5067 r5809  
    33#  Read by /usr/local/sbin/wireless-up.pl
    44#
    5 # config CNodeAJSoft
     5# config CNodeAJSoft2
    66$location="5meilaan (Parelvissers), Leiden";
    7 $master_ip='172.20.136.1'; 
     7$master_ip='172.20.137.1'; 
    88$gw_open='closed';
    99$nodetype='CNode';
    10 $nodename='AJSoft';
     10$nodename='AJSoft2';
    1111$release="5.0-RELEASE";
    1212$node_config_version="1";
    … …  
    2323$LOKATIE='5meilaan';
    2424
    25 
    26 
    27 $config{'ep0'}=sprintf <<ED0;  # Ethernet
     25$config{'sis0'}=sprintf <<SIS0;  # Ethernet
    2826TYPE=ethernet
    29 IP=172.20.136.65/28
     27IP=172.20.136.66/28
    3028
    3129DESC=Ethernet naar Parelvissers
    … …  
    3331SPEED=10240000000
    3432
    35 DHCP=67-78
    36 
    3733OSPF_BROADCAST=no
    3834OSPF_NEIGHBORS=no
    3935
    40 ED0
     36SIS0
    4137
     38$config{'wi0'}=sprintf <<WI0;  # omni
     39TYPE=wireless
     40IP=172.16.3.13/30
    4241
    43 
    44 $config{'wi0'}=sprintf <<EW0;  # omni
    45 TYPE=wireless
    46 IP=$master_ip/26
    47 
    48 DESC=omni voor de buurt
    49 SDESC=omni
     42DESC=interlink
     43SDESC=interlink
    5044SPEED=11534336
    5145
    … …  
    5650
    5751MODE=master
    58 ESSID=ap-omni.ajsoft.wleiden.net
     52ESSID=il-w.ajsoft2.wleiden.net
    5953CHANNEL=11
    6054
    … …  
    6761HEIGTH=22
    6862
    69 EW0
     63WI0
    7064
    71 $config{'wi0:0'}=sprintf <<EW00;  # Link naar Bizet
     65$config{'ath0'}=sprintf <<ATH0;  # link livinglab
    7266TYPE=wireless
    73 IP=172.16.0.109/30
    74 DESC=Link naar Bizet
    75 SDESC=2bizet
    76 SPEED=11534336
    77 POINT_TO_POINT=172.16.0.110
    78 EW00
    79 
    80 
    81 
    82 $config{'wi1'}=sprintf <<EW1;  # link haagwijk
    83 TYPE=wireless
    84 IP=172.16.1.158/30
    85 DESC=Link naar Haagwijk
    86 SDESC=2haagwijk
    87 SPEED=11534336
    88 POINT_TO_POINT=172.16.1.157
     67IP=172.16.2.242/30
     68DESC=Link naar LivingLab
     69SDESC=2livinglab
     70SPEED=54000000
     71POINT_TO_POINT=172.16.2.241
    8972DHCP=no
    9073
    9174OSPF_AREA=0
    9275OSPF_BROADCAST=no
    93 OSPF_NEIGHBORS=172.16.1.157
     76OSPF_NEIGHBORS=172.16.2.241
    9477
    9578MODE=managed
    96 ESSID=il-nw.haagwijk.wleiden.net
     79ESSID=il-n.livinglab.wleiden.net
    9780
    9881#CHANNEL=11
    … …  
    10689HEIGTH=22
    10790
    108 EW1
     91ATH0
    10992
    110 
    111 $config{'wi2'}=sprintf <<EW2; # Link naar Robijn
    112 TYPE=wireless
    113 IP=172.16.1.33/30
    114 DESC=InterLink naar Robijn
    115 SDESC=2robijn
    116 SPEED=1153436
    117 POINT_TO_POINT=172.16.1.34
    118 DHCP=no
    119 
    120 OSPF_BROADCAST=no
    121 OSPF_NEIGHBORS=172.16.1.34
    122 
    123 MODE=master
    124 ESSID=il-nw.ajsoft.wleiden.net
    125 
    126 CHANNEL=1
    127 
    128 POLAR=Hor
    129 ANTENNA=SD15
    130 GAIN=13dBi
    131 DIRECTION=315
    132 BEAMWIDTH=40
    133 CABLE=2
    134 HEIGTH=22
    135 
    136 EW2
    137 
    138 $config{'wi2:0'}=sprintf <<EW20;  # Link naar NodeGer
    139 TYPE=wireless
    140 IP=172.16.1.237/30
    141 DESC=Link naar NodeGer
    142 SDESC=2ger
    143 SPEED=11534336
    144 POINT_TO_POINT=172.16.1.238
    145 OSPF_BROADCAST=no
    146 OSPF_NEIGHBORS=172.16.1.238
    147 EW20
    148 
    149 $config{'wi2:1'}=sprintf <<EW21; # Link naar Meca
    150 TYPE=wireless
    151 IP=172.16.1.77/30
    152 DESC=Link naar Meca
    153 SDESC=2meca
    154 SPEED=11534336
    155 POINT_TO_POINT=172.16.1.78
    156 OSPF_BROADCAST=no
    157 OSPF_NEIGHBORS=172.16.1.78
    158 
    159 EW21
    160 
    161 
    162 $config{'wi2:2'}=sprintf <<EW22;  # Link naar Zwaluwmz
    163 TYPE=wireless
    164 IP=172.16.2.17/30
    165 DESC=Link naar Zwaluwmz
    166 SDESC=2zwaluwmz
    167 SPEED=11534336
    168 POINT_TO_POINT=172.16.2.18
    169 OSPF_BROADCAST=no
    170 OSPF_NEIGHBORS=172.16.2.18
    171 EW22
    172 
    173 
    174 $config{'wi3'}=sprintf <<EW3;
    175 TYPE=wireless
    176 IP=172.16.0.142/30
    177 DESC=Link naar RenV
    178 SDESC=2rv
    179 SPEED=1153436
    180 POINT_TO_POINT=172.16.0.141
    181 DHCP=no
    182 
    183 OSPF_AREA=0
    184 OSPF_BROADCAST=no
    185 OSPF_NEIGHBORS=172.16.0.141
    186 
    187 MODE=managed
    188 ESSID=il-zw.rv.wleiden.net
    189 CHANNEL=5
    190 
    191 POLAR=vert
    192 ANTENNA=SD15
    193 GAIN=13dBi
    194 DIRECTION=45
    195 BEAMWIDTH=40
    196 CABLE=2
    197 HEIGTH=22
    198 
    199 EW3
    200 
    201 
    202 

  • nodes/CNodeLivingLab/wleiden.conf

    r5789 r5809  
    3636SIS0
    3737
     38$config{'sis0:0'}=sprintf <<SIS00;
     39TYPE=Ethernet
     40IP=172.16.2.253/30
     41
     42DESC=Ethernet naar proxy
     43SDESC=2proxy
     44SPEED=10240000000
     45
     46DHCP=no
     47
     48SIS00
     49
    3850
    3951$config{'sis1'}=sprintf <<SIS1;
    … …  
    5163MODE=master
    5264ESSID=il-n.livinglab.wleiden.net
    53 CHANNEL=36
     65CHANNEL=165
    5466
    5567SIS1
     68
     69$config{'sis1:0'}=sprintf <<SIS10;
     70TYPE=ethernet
     71IP=172.16.3.9/30
     72
     73DESC=Ethernet naar Wandy mgmt iface
     74SDESC=2Wandy1
     75SPEED=10240000000
     76
     77DHCP=no
     78
     79POINT_TO_POINT=172.16.3.10
     80
     81SIS10
    5682
    5783

  • nodes/getrange.py

    r5519 r5809  
    3131        match = ipre.match(l)
    3232        if match == None:
    33                 print "'" + l + "'"
     33                #print "'" + l + "'"
     34                continue
     35        if len(match.groups()) == 0:
     36                continue
    3437        addr = parseaddr(match.group(1))
    3538        mask = int(match.group(2))
    … …  
    4548        i = 0xac110000
    4649
     50i = 0xac100300
    4751while bezet.has_key(i):
    4852        i = i + numaddrs
Note: See TracChangeset for help on using the changeset viewer.