hipl-core team mailing list archive

[Diego Biurrun <diego@xxxxxxxxxx>]

On Mon, Sep 13, 2010 at 02:02:23PM +0000, noreply@xxxxxxxxxxxxx wrote:
> Merge authors:
>   Christof Mroz (christof-mroz)
> ------------------------------------------------------------
> revno: 4927 [merge]
> committer: Christof Mroz <christof.mroz@xxxxxxxxxxxxxx>
> branch nick: trunk
> timestamp: Mon 2010-09-13 15:59:36 +0200
> message:
>   Removed superfluous typedef. Some const, cosmetic and doc changes.

This mixes several independent changes.

Please install a warning system in your brain that marks such commits
as VERBOTEN and recoils at the mere thought of performing the action.
Think of the recoil at the mere thought of placing your hand in a
frying pan.  Works like a charm here.

> --- firewall/cache_port.c	2010-07-29 08:51:54 +0000
> +++ firewall/cache_port.c	2010-09-09 00:54:32 +0000
> @@ -173,10 +173,10 @@
>   *
>   * @return the cache entry if found or NULL otherwise
>   */
> -firewall_port_cache_hl_t *hip_firewall_port_cache_db_match(in_port_t port,
> +struct firewall_port_cache_hl *hip_firewall_port_cache_db_match(in_port_t port,
>                                                             int proto)

indentation messup

> --- firewall/cache_port.h	2010-07-04 17:54:18 +0000
> +++ firewall/cache_port.h	2010-09-09 00:54:32 +0000
> @@ -33,7 +33,7 @@
>  #include "lib/core/icomm.h"
>  
>  void hip_firewall_port_cache_init_hldb(void);
> -firewall_port_cache_hl_t *hip_firewall_port_cache_db_match(in_port_t port,
> +struct firewall_port_cache_hl *hip_firewall_port_cache_db_match(in_port_t port,
>                                                             int proto);

same

Did you do a mechanical substitution and never look at the diff before
committing?

> === modified file 'firewall/firewall.c'
> --- firewall/firewall.c	2010-08-30 08:28:41 +0000
> +++ firewall/firewall.c	2010-09-09 00:54:32 +0000
> @@ -1308,8 +1308,8 @@
>  
>  /**
> - * Process an other (not HIP, ESP, TCP) packet from the inbound packet capture
> - * queue
> + * Process another (not HIP, ESP, TCP) packet from the inbound packet
> + * capture queue. May result in LSI or SysOPP Transformation.

unrelated

> @@ -1486,7 +1486,7 @@
>   * @param  ctx        the context.
>   * @param  buf        a pointer to a IP packet.
> - * @param ip_version  the IP version for this packet
> + * @param  ip_version the IP version for this packet

unrelated

more unrelated stuff below

> --- firewall/lsi.c	2010-08-20 14:34:13 +0000
> +++ firewall/lsi.c	2010-09-09 00:54:32 +0000
> @@ -348,7 +348,8 @@
>      if (port_cache_entry &&
>          (port_cache_entry->traffic_type ==
> -         FIREWALL_PORT_CACHE_IPV6_TRAFFIC)) {
> +         FIREWALL_PORT_CACHE_IPV6_TRAFFIC))
> +    {

this was correct before

Diego