Ignore:
Timestamp:
05/14/13 18:10:22 (11 years ago)
Author:
Kris Deugau
Message:

/branches/stable

Merge /trunk r517 (merge /branches/htmlform)
Conflicts all resolved towards /trunk.
Fix a minor syntax error with "while (@data..." -> "while (my @data..."
(may cause merge conflicts later)

Location:
branches/stable
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/stable

  • branches/stable/alloctypes.html

    r507 r593  
    1 <html><head>
    2 
    3 <title>IP Database</title><meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
    4 
    5 <link rel="stylesheet" type="text/css" href="ipdb.css">
    6 <link rel="stylesheet" type="text/css" href="local.css">
    7 
     1<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
     2<html>
     3<head>
     4        <title>IP Database - Allocation Types</title>
     5        <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
     6        <link rel="stylesheet" type="text/css" href="ipdb.css">
     7        <link rel="stylesheet" type="text/css" href="local.css">
    88</head>
     9
    910<body>
    1011
    1112<table class="regular">
    1213
    13 <tr><td colspan=2 class="heading">Preseeded Allocation Types:</td><tr>
    14 
    15 <tr class="color1">
     14<tr><td colspan=2 class="heading">Preseeded Allocation Types:</td></tr>
     15
     16<tr class="row0">
    1617<td>Customer netblock (default)</td>
    1718<td>A direct allocation /30 or larger to a customer.  Note that this does NOT
    … …  
    2021</tr>
    2122
    22 <tr class="color2">
     23<tr class="row1">
    2324<td>Static IP - Server pool</td>
    2425<td>A single IP from a pool designated for servers</td>
    2526</tr>
    2627
    27 <tr class="color1">
     28<tr class="row0">
    2829<td>Static IP - Cable</td>
    2930<td>A single IP address from a designated pool on the cable network.</td>
    3031</tr>
    3132
    32 <tr class="color2">
     33<tr class="row1">
    3334<td>Static IP - DSL</td>
    3435<td>A single IP address from a designated pool on the DSL network.</td>
    3536</tr>
    3637
    37 <tr class="color1">
     38<tr class="row0">
    3839<td>Static IP - Dialup</td>
    3940<td>A single IP address from a designated pool on a dialup RAS.</td>
    4041</tr>
    4142
    42 <tr class="color2">
     43<tr class="row1">
    4344<td>Static IP - Wireless</td>
    4445<td>A single IP address from a designated pool on a wireless connection.</td>
    4546</tr>
    4647
    47 <tr class="color1">
     48<tr class="row0">
    4849<td>Static pool - Servers</td>
    4950<td>A pool of IP addresses available for one-by-one assignment to servers in a
    … …  
    5152</tr>
    5253
    53 <tr class="color2">
     54<tr class="row1">
    5455<td>Static pool - Cable</td>
    5556<td>A pool of IP addresses available for one-by-one assignment to customers on
    … …  
    5758</tr>
    5859
    59 <tr class="color1">
     60<tr class="row0">
    6061<td>Static pool - DSL</td>
    6162<td>A pool of IP addresses available for one-by-one assignment to customers on
    … …  
    6465</tr>
    6566
    66 <tr class="color2">
     67<tr class="row1">
    6768<td>Static pool - Dialup</td>
    6869<td>A pool of IP addresses available for one-by-one assignment to dialup
    … …  
    7071</tr>
    7172
    72 <tr class="color1">
     73<tr class="row0">
    7374<td>Static pool - Wireless</td>
    7475<td>A pool of IP addresses available for one-by-one assignment to customers on a
    … …  
    7677</tr>
    7778
    78 <tr class="color2">
     79<tr class="row1">
    7980<td>End-use netblock</td>
    8081<td>A /30 or larger allocation for arbitrary services - note this should not
    … …  
    8384</tr>
    8485
    85 <tr class="color1">
     86<tr class="row0">
    8687<td>Dialup netblock</td>
    8788<td>Netblock assigned to one or more RAS units in a POP</td>
    8889</tr>
    8990
    90 <tr class="color2">
     91<tr class="row1">
    9192<td>Dynamic DSL block</td>
    9293<td>Netblock for (mostly residential) PPPoE DSL.</td>
    9394</tr>
    9495
    95 <tr class="color1">
     96<tr class="row0">
    9697<td>Dynamic cable block</td>
    9798<td>Netblock for (mostly residential) DHCP cable.</td>
    9899</tr>
    99100
    100 <tr class="color2">
     101<tr class="row1">
    101102<td>Dynamic WiFi block</td>
    102103<td>Netblock for (mostly residential) (mostly) PPPoE wireless.</td>
    103104</tr>
    104105
    105 <tr class="color1">
     106<tr class="row0">
    106107<td>Dynamic VoIP block</td>
    107108<td>Netblock for DHCP-assigned VoIP services.</td>
    108109</tr>
    109110
    110 <tr class="color2">
     111<tr class="row1">
    111112<td>Static IP - LAN/POP</td>
    112113<td>A single IP address from a designated pool for internal LANs - either at a
    … …  
    114115</tr>
    115116
    116 <tr class="color1">
     117<tr class="row0">
    117118<td>Static IP - Managment</td>
    118119<td>A single IP address from a designated pool for managed devices.</td>
    119120</tr>
    120121
    121 <tr class="color2">
     122<tr class="row1">
    122123<td>Static IP - Wifi CPE</td>
    123124<td>A single IP address from a designated pool for wireless CPE devices.</td>
    124125</tr>
    125126
    126 <tr class="color1">
     127<tr class="row0">
    127128<td>Static pool - LAN/POP</td>
    128129<td>A pool of IP addresses available for one-by-one assignment to internal LAN
    … …  
    130131</tr>
    131132
    132 <tr class="color2">
     133<tr class="row1">
    133134<td>Static Pool - Managment</td>
    134135<td>A pool of IP addresses available for assignment to managed devices.</td>
    135136</tr>
    136137
    137 <tr class="color1">
     138<tr class="row0">
    138139<td>Static pool - Wifi CPE</td>
    139140<td>A pool of IP addresses available for assignment to wireless CPE devices.</td>
    140141</tr>
    141142
    142 <tr class="color2">
     143<tr class="row1">
    143144<td>Reserve for WAN blocks</td>
    144145<td>Reserve a chunk of IP space for core routers/etc.</td>
    145146</tr>
    146147
    147 <tr class="color1">
     148<tr class="row0">
    148149<td>Reserve for dynamic-route DSL netblocks</td>
    149150<td>Reserve a chunk of IP space for netblocks configured on the customer end via
    … …  
    152153</tr>
    153154
    154 <tr class="color2">
     155<tr class="row1">
    155156<td>Reserve for ATM</td>
    156157<td>Reserve a chunk of IP space for allocation to customers on ATM.</td>
    157158</tr>
    158159
    159 <tr class="color1">
     160<tr class="row0">
    160161<td>Reserve for fibre</td>
    161162<td>Reserve a chunk of IP space for customers on a fibre connection.</td>
    162163</tr>
    163164
    164 <tr class="color2">
     165<tr class="row1">
    165166<td>WAN block</td>
    166167<td>Individual netblock assignment for a core router.  Always taken from a
    … …  
    168169</tr>
    169170
    170 <tr class="color1">
     171<tr class="row0">
    171172<td>Dynamic-route DSL netblock</td>
    172173<td>Customer assignment for a netblock configured on the customer end via
    … …  
    175176</tr>
    176177
    177 <tr class="color2">
     178<tr class="row1">
    178179<td>ATM block</td>
    179180<td>Customer assignment for a customer on ATM.  Always taken from a
    … …  
    181182</tr>
    182183
    183 <tr class="color1">
     184<tr class="row0">
    184185<td>Fibre</td>
    185186<td>Customer assignment for a customer on fibre. Always taken from a block
    … …  
    187188</tr>
    188189
    189 <tr class="color2">
     190<tr class="row1">
    190191<td>Routing</td>
    191192<td>Blocks not actually assigned to a service on their own, but which
    … …  
    193194</tr>
    194195
    195 <tr class="color1">
     196<tr class="row0">
    196197<td>Master block</td>
    197198<td>Allocations provided by the regional registry (ARIN, RIPE, LACNIC, AfriNIC,
Note: See TracChangeset for help on using the changeset viewer.