diff options
Diffstat (limited to 'sys/netpfil/ipfw')
| -rw-r--r-- | sys/netpfil/ipfw/dn_heap.h | 4 | ||||
| -rw-r--r-- | sys/netpfil/ipfw/dummynet.txt | 12 | ||||
| -rw-r--r-- | sys/netpfil/ipfw/ip_dn_glue.c | 2 | ||||
| -rw-r--r-- | sys/netpfil/ipfw/ip_dummynet.c | 2 | ||||
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw2.c | 4 | ||||
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw_dynamic.c | 4 | ||||
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw_nat.c | 2 | ||||
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw_sockopt.c | 10 | ||||
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw_table.c | 10 | ||||
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw_table_algo.c | 4 | ||||
| -rw-r--r-- | sys/netpfil/ipfw/ip_fw_table_value.c | 4 |
11 files changed, 29 insertions, 29 deletions
diff --git a/sys/netpfil/ipfw/dn_heap.h b/sys/netpfil/ipfw/dn_heap.h index c95473a..cb6e03e 100644 --- a/sys/netpfil/ipfw/dn_heap.h +++ b/sys/netpfil/ipfw/dn_heap.h @@ -83,7 +83,7 @@ enum { * heap_insert() adds a key-pointer pair to the heap * * HEAP_TOP() returns a pointer to the top element of the heap, - * but makes no checks on its existance (XXX should we change ?) + * but makes no checks on its existence (XXX should we change ?) * * heap_extract() removes the entry at the top, returing the pointer. * (the key should have been read before). @@ -146,7 +146,7 @@ int heap_scan(struct dn_heap *, int (*)(void *, uintptr_t), uintptr_t); * of the dn_ht_find(), and of the callbacks: * * DNHT_KEY_IS_OBJ means the key is the object pointer. - * It is usally of interest for the hash and match functions. + * It is usually of interest for the hash and match functions. * * DNHT_MATCH_PTR during a lookup, match pointers instead * of calling match(). Normally used when removing specific diff --git a/sys/netpfil/ipfw/dummynet.txt b/sys/netpfil/ipfw/dummynet.txt index b3b2ee9..68cce1a 100644 --- a/sys/netpfil/ipfw/dummynet.txt +++ b/sys/netpfil/ipfw/dummynet.txt @@ -86,7 +86,7 @@ USERLAND-KERNEL API (ip_dummynet.h) struct dn_link: contains data about the physical link such as - bandwith, delay, burst size; + bandwidth, delay, burst size; struct dn_fs: describes a flowset, i.e. a template for queues. @@ -444,7 +444,7 @@ of the object to remove Delete of pipe x ---------------- -A pipe can be deleted by the user throught the command 'ipfw pipe x delete'. +A pipe can be deleted by the user through the command 'ipfw pipe x delete'. To delete a pipe, the pipe is removed from the pipe list, and then deleted. Also the scheduler associated with this pipe should be deleted. For compatibility with old dummynet syntax, the associated FIFO scheduler and @@ -452,7 +452,7 @@ FIFO flowset must be deleted. Delete of flowset x ------------------- -To remove a flowset, we must be sure that is no loger referenced by any object. +To remove a flowset, we must be sure that is no longer referenced by any object. If the flowset to remove is in the unlinked flowset list, there is not any issue, the flowset can be safely removed calling a free() (the flowset extension is not yet created if the flowset is in this list). @@ -492,7 +492,7 @@ If the counter was not 0, we wait for it. Every time the dummynet_task() function extract a scheduler from the system_heap, the counter is decremented. If the scheduler has the delete flag enabled the dequeue() is not called and delete_scheduler_instance() is called to delete the instance. -Obviously this scheduler instance is no loger inserted in the system_heap. +Obviously this scheduler instance is no longer inserted in the system_heap. If the counter reaches 0, the delete_scheduler_template() function is called all memory is released. NOTE: Flowsets that belong to this scheduler are not deleted, so if a new @@ -559,7 +559,7 @@ There are four request for old dummynet: depending of its version. There are two function that build the corrected buffer, ip_dummynet_get7() and ip_dummynet_get8(). These functions reproduce the buffer exactly as 'ipfw' expect. The only difference - is that the weight parameter for a queue is no loger sent by dummynet and so + is that the weight parameter for a queue is no longer sent by dummynet and so it is set to 0. Moreover, because of the internal structure has changed, the bucket size of a queue could not be correct, because now all flowset share the hash @@ -581,7 +581,7 @@ I have to modify the ip_fw2.c file to manage these two case, and added a variable (is7) to store the ipfw version used, using an approach like the previous file: - when a new rule is added (option IP_FW_ADD) the is7 variable is set if the - size of the rule received corrispond to FreeBSD 7.2 ipfw version. If so, the + size of the rule received correspond to FreeBSD 7.2 ipfw version. If so, the rule is converted to version 8 calling the function convert_rule_to_8(). Moreover, after the insertion of the rule, the rule is now reconverted to version 7 because the ipfw binary will print it. diff --git a/sys/netpfil/ipfw/ip_dn_glue.c b/sys/netpfil/ipfw/ip_dn_glue.c index 7d7e695..02fbf3e 100644 --- a/sys/netpfil/ipfw/ip_dn_glue.c +++ b/sys/netpfil/ipfw/ip_dn_glue.c @@ -778,7 +778,7 @@ ip_dummynet_compat(struct sockopt *sopt) void *v = NULL; struct dn_id oid; - /* Lenght of data, used to found ipfw version... */ + /* Length of data, used to found ipfw version... */ int len = sopt->sopt_valsize; /* len can be 0 if command was dummynet_flush */ diff --git a/sys/netpfil/ipfw/ip_dummynet.c b/sys/netpfil/ipfw/ip_dummynet.c index 120f30f..941e0a3 100644 --- a/sys/netpfil/ipfw/ip_dummynet.c +++ b/sys/netpfil/ipfw/ip_dummynet.c @@ -1629,7 +1629,7 @@ dummynet_flush(void) * with an oid which is at least a dn_id. * - the first object is the command (config, delete, flush, ...) * - config_link must be issued after the corresponding config_sched - * - parameters (DN_TXT) for an object must preceed the object + * - parameters (DN_TXT) for an object must precede the object * processed on a config_sched. */ int diff --git a/sys/netpfil/ipfw/ip_fw2.c b/sys/netpfil/ipfw/ip_fw2.c index b0a7474..45da69d 100644 --- a/sys/netpfil/ipfw/ip_fw2.c +++ b/sys/netpfil/ipfw/ip_fw2.c @@ -936,7 +936,7 @@ ipfw_chk(struct ip_fw_args *args) * offset == 0 means that (if this is an IPv4 packet) * this is the first or only fragment. * For IPv6 offset|ip6f_mf == 0 means there is no Fragment Header - * or there is a single packet fragement (fragement header added + * or there is a single packet fragment (fragment header added * without needed). We will treat a single packet fragment as if * there was no fragment header (or log/block depending on the * V_fw_permit_single_frag6 sysctl setting). @@ -1999,7 +1999,7 @@ do { \ * certainly be inp_user_cookie? */ - /* For incomming packet, lookup up the + /* For incoming packet, lookup up the inpcb using the src/dest ip/port tuple */ if (inp == NULL) { inp = in_pcblookup(pi, diff --git a/sys/netpfil/ipfw/ip_fw_dynamic.c b/sys/netpfil/ipfw/ip_fw_dynamic.c index 96f38e4..991de22 100644 --- a/sys/netpfil/ipfw/ip_fw_dynamic.c +++ b/sys/netpfil/ipfw/ip_fw_dynamic.c @@ -989,7 +989,7 @@ ipfw_dyn_send_ka(struct mbuf **mtailp, ipfw_dyn_rule *q) } /* - * This procedure is used to perform various maintance + * This procedure is used to perform various maintenance * on dynamic hash list. Currently it is called every second. */ static void @@ -1021,7 +1021,7 @@ ipfw_dyn_tick(void * vnetx) /* - * Walk thru all dynamic states doing generic maintance: + * Walk through all dynamic states doing generic maintenance: * 1) free expired states * 2) free all states based on deleted rule / set * 3) send keepalives for states if needed diff --git a/sys/netpfil/ipfw/ip_fw_nat.c b/sys/netpfil/ipfw/ip_fw_nat.c index df40398..a32d32f 100644 --- a/sys/netpfil/ipfw/ip_fw_nat.c +++ b/sys/netpfil/ipfw/ip_fw_nat.c @@ -932,7 +932,7 @@ ipfw_nat_cfg(struct sockopt *sopt) /* * Allocate 2x buffer to store converted structures. - * new redir_cfg has shrinked, so we're sure that + * new redir_cfg has shrunk, so we're sure that * new buffer size is enough. */ buf = malloc(roundup2(len, 8) + len2, M_TEMP, M_WAITOK | M_ZERO); diff --git a/sys/netpfil/ipfw/ip_fw_sockopt.c b/sys/netpfil/ipfw/ip_fw_sockopt.c index 5eecf97..c2b9a79 100644 --- a/sys/netpfil/ipfw/ip_fw_sockopt.c +++ b/sys/netpfil/ipfw/ip_fw_sockopt.c @@ -2467,7 +2467,7 @@ ref_rule_objects(struct ip_fw_chain *ch, struct ip_fw *rule, if (error != 0) break; /* - * Compability stuff for old clients: + * Compatibility stuff for old clients: * prepare to automaitcally create non-existing objects. */ if (unresolved != 0) { @@ -2579,7 +2579,7 @@ free: * Rules in reply are modified to store their actual ruleset number. * * (*1) TLVs inside IPFW_TLV_TBL_LIST needs to be sorted ascending - * accoring to their idx field and there has to be no duplicates. + * according to their idx field and there has to be no duplicates. * (*2) Numbered rules inside IPFW_TLV_RULE_LIST needs to be sorted ascending. * (*3) Each ip_fw structure needs to be aligned to u64 boundary. * @@ -3279,7 +3279,7 @@ ipfw_flush_sopt_data(struct sockopt_data *sd) } /* - * Ensures that @sd buffer has contigious @neeeded number of + * Ensures that @sd buffer has contiguous @neeeded number of * bytes. * * Returns pointer to requested space or NULL. @@ -3307,7 +3307,7 @@ ipfw_get_sopt_space(struct sockopt_data *sd, size_t needed) } /* - * Requests @needed contigious bytes from @sd buffer. + * Requests @needed contiguous bytes from @sd buffer. * Function is used to notify subsystem that we are * interesed in first @needed bytes (request header) * and the rest buffer can be safely zeroed. @@ -3396,7 +3396,7 @@ ipfw_ctl3(struct sockopt *sopt) /* * Determine opcode type/buffer size: * allocate sliding-window buf for data export or - * contigious buffer for special ops. + * contiguous buffer for special ops. */ if ((h.dir & HDIR_SET) != 0) { /* Set request. Allocate contigous buffer. */ diff --git a/sys/netpfil/ipfw/ip_fw_table.c b/sys/netpfil/ipfw/ip_fw_table.c index 175202a..2bb70d6 100644 --- a/sys/netpfil/ipfw/ip_fw_table.c +++ b/sys/netpfil/ipfw/ip_fw_table.c @@ -319,7 +319,7 @@ find_ref_table(struct ip_fw_chain *ch, struct tid_info *ti, if (op == OP_DEL) return (ESRCH); - /* Compability mode: create new table for old clients */ + /* Compatibility mode: create new table for old clients */ if ((tei->flags & TEI_FLAGS_COMPAT) == 0) return (ESRCH); @@ -927,7 +927,7 @@ manage_table_ent_v0(struct ip_fw_chain *ch, ip_fw3_opheader *op3, tei.masklen = xent->masklen; ipfw_import_table_value_legacy(xent->value, &v); tei.pvalue = &v; - /* Old requests compability */ + /* Old requests compatibility */ tei.flags = TEI_FLAGS_COMPAT; if (xent->type == IPFW_TABLE_ADDR) { if (xent->len - hdrlen == sizeof(in_addr_t)) @@ -1207,7 +1207,7 @@ flush_table(struct ip_fw_chain *ch, struct tid_info *ti) uint8_t tflags; /* - * Stage 1: save table algoritm. + * Stage 1: save table algorithm. * Reference found table to ensure it won't disappear. */ IPFW_UH_WLOCK(ch); @@ -2582,7 +2582,7 @@ ipfw_foreach_table_tentry(struct ip_fw_chain *ch, uint16_t kidx, */ /* - * Finds algoritm by index, table type or supplied name. + * Finds algorithm by index, table type or supplied name. * * Returns pointer to algo or NULL. */ @@ -3224,7 +3224,7 @@ ipfw_swap_tables_sets(struct ip_fw_chain *ch, uint32_t set, * Move all tables which are reference by rules in @rr to set @new_set. * Makes sure that all relevant tables are referenced ONLLY by given rules. * - * Retuns 0 on success, + * Returns 0 on success, */ int ipfw_move_tables_sets(struct ip_fw_chain *ch, ipfw_range_tlv *rt, diff --git a/sys/netpfil/ipfw/ip_fw_table_algo.c b/sys/netpfil/ipfw/ip_fw_table_algo.c index c04ee86..b0ad73d 100644 --- a/sys/netpfil/ipfw/ip_fw_table_algo.c +++ b/sys/netpfil/ipfw/ip_fw_table_algo.c @@ -181,7 +181,7 @@ __FBSDID("$FreeBSD$"); * OPTIONAL, locked (UH). (M_NOWAIT). Returns 0 on success. * * Finds entry specified by given key. - * * Caller is requred to do the following: + * * Caller is required to do the following: * entry found: returns 0, export entry to @tent * entry not found: returns ENOENT * @@ -263,7 +263,7 @@ __FBSDID("$FreeBSD$"); * Dumps entry @e to @tent. * * - * -print_config: prints custom algoritm options into buffer. + * -print_config: prints custom algorithm options into buffer. * typedef void (ta_print_config)(void *ta_state, struct table_info *ti, * char *buf, size_t bufsize); * OPTIONAL. locked(UH). (M_NOWAIT). diff --git a/sys/netpfil/ipfw/ip_fw_table_value.c b/sys/netpfil/ipfw/ip_fw_table_value.c index 7e2f5cb..7ca316d 100644 --- a/sys/netpfil/ipfw/ip_fw_table_value.c +++ b/sys/netpfil/ipfw/ip_fw_table_value.c @@ -500,7 +500,7 @@ ipfw_link_table_values(struct ip_fw_chain *ch, struct tableop_state *ts) count = ts->count; for (i = 0; i < count; i++) { ptei = &tei[i]; - ptei->value = 0; /* Ensure value is always 0 in the beginnig */ + ptei->value = 0; /* Ensure value is always 0 in the beginning */ mask_table_value(ptei->pvalue, &tval, ts->vmask); ptv = (struct table_val_link *)ipfw_objhash_lookup_name(vi, 0, (char *)&tval); @@ -603,7 +603,7 @@ ipfw_link_table_values(struct ip_fw_chain *ch, struct tableop_state *ts) } /* - * Compability function used to import data from old + * Compatibility function used to import data from old * IP_FW_TABLE_ADD / IP_FW_TABLE_XADD opcodes. */ void |
