[Olsr-cvs] olsrd-current/lib/nameservice/src mapwrite.c, 1.1, 1.2 nameservice.c, 1.39, 1.40

[Bernd Petrovitsch]

Update of /cvsroot/olsrd/olsrd-current/lib/nameservice/src
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16024/lib/nameservice/src

Modified Files:
	mapwrite.c nameservice.c 
Log Message:
Major Changes:
- renamed "struct local_hna_entry" to "struct ip_prefix_list" since
  it is exactly that. Renamed the functions in src/local_hna_set.{c,h}
  in the same way.
- each IPv4 and IPv6 function pairs in src/local_hna_set.{c,h} is
  called from the same place and have the same signature. So I
  condensed each of them.
- Since we have only 3 functions left in src/local_hna_set.{c,h}
  and they are used for the configuration, the .h file is now part
  of src/olsr_cfg.h and the ,c file of src/cfgparser/olsrd_conf.c.
- replaced "struct ipc_net" with "struct ip_prefix_list" since it
  serves the same purpose as the "struct ip_prefix_list"
- replaced "struct ipc_host" with "struct ip_prefix_list" since it
  serves the same purpose as the "struct ip_prefix_list" and is
  just a special case. No need to duplicate code etc.
- removed "union hna_netmask" from src/olsr_types since we use the
  prefix_len everywhere (and that is an olsr_u8_t in several other
  struct's).
  That implies changes and simplifications in the code handling
  them (since the IPv4 is similar to IPv6).
- the config file parser now understands for IPv4 addresses also
  "/$prefix".
- On the output side, the patch generates only "/$prefix" which
  kills code since it is the same as the IPv6 handling.
- There are some netmask conversions left (mainly in the plugins)
  but that be cleaned up afterwards.
- extracted ip{,4,6}{cmp,equal} and formatting functions from
  net_olsr.{c,h} into src/ipcalc.{c,h} since net_olsr.h became
  IMHO to much of a "put anything in there".
- renamed "sockaddr_to_string()" to "sockaddr4_to_string()"
  since it is exactly that (unless I'm missing something).

Minor Changes:
- lib/httpinfo/src/admin_html.h contained just some variable
  definitions so it is now integrated in the only user:
  admin_interface.c
- olsrd_dot_draw.c got rid of two indicator variables if
  a socket is valid or not. Since sockets may use "-1" as the
  "not open", "invalid" value, there is no need for two more
  ints.
- and the dot_draw plugin is somewhat smaller and easier to read.
- const'ified some functions


Index: mapwrite.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/nameservice/src/mapwrite.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** mapwrite.c	29 Nov 2007 00:26:16 -0000	1.1
--- mapwrite.c	29 Nov 2007 00:49:41 -0000	1.2
***************
*** 44,48 ****
  #include "mid_set.h"
  #include "tc_set.h"
! #include "net_olsr.h"
  #include "mapwrite.h"
  
--- 44,48 ----
  #include "mid_set.h"
  #include "tc_set.h"
! #include "ipcalc.h"
  #include "mapwrite.h"
  

Index: nameservice.c
===================================================================
RCS file: /cvsroot/olsrd/olsrd-current/lib/nameservice/src/nameservice.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** nameservice.c	29 Nov 2007 00:26:16 -0000	1.39
--- nameservice.c	29 Nov 2007 00:49:41 -0000	1.40
***************
*** 47,50 ****
--- 47,51 ----
  
  #include "olsr.h"
+ #include "ipcalc.h"
  #include "net_olsr.h"
  #include "routing_table.h"
***************
*** 1278,1282 ****
  allowed_ip(const union olsr_ip_addr *addr)
  {
! 	struct local_hna_entry *hna;
  	struct interface *iface;
  	union olsr_ip_addr tmp_ip, tmp_msk;
--- 1279,1283 ----
  allowed_ip(const union olsr_ip_addr *addr)
  {
! 	struct ip_prefix_list *hna;
  	struct interface *iface;
  	union olsr_ip_addr tmp_ip, tmp_msk;
***************
*** 1431,1435 ****
  olsr_bool get_isdefhna_latlon(void)
  {
! 	struct local_hna_entry *hna;
  	for (hna = olsr_cnf->hna_entries; hna != NULL; hna = hna->next){
  		if (hna->net.prefix_len == 0) {
--- 1432,1436 ----
  olsr_bool get_isdefhna_latlon(void)
  {
! 	struct ip_prefix_list *hna;
  	for (hna = olsr_cnf->hna_entries; hna != NULL; hna = hna->next){
  		if (hna->net.prefix_len == 0) {