Maintaining the geoip patchlet

Maintaining the geoip patchlet

[Samuel Jean]

Hi,

I've been quite busy past months and couldn't track the geoip status in
current Linux kernels. I've dropped registration of cookinglinux.org and
this is why our email addresses don't work anymore. Sorry for that.

Nicolas and I will continue to maintain the geoip match. I am gonna setup
the repository tonight, after work.

I think this apt-like pom is a great idea.

Keep up the good work.

Cheers,
--peejix

Re: Maintaining the geoip patchlet

[Samuel Jean]

On Fri, May 5, 2006, Samuel Jean <jix@bugmachine.ca> said:

> Nicolas and I will continue to maintain the geoip match. I am gonna setup
> the repository tonight, after work.

Patrick --

Here's the URL where my index file waits happily.

http://mynodes.net/pub/linux/netfilter/patchlets/

This, in fact, redirect to my people.netfilter.org. Please let curl allow
redirection. 


Cheers,
--peejix

Re: Maintaining the geoip patchlet

[Patrick McHardy]

Samuel Jean wrote:
> Patrick --
> 
> Here's the URL where my index file waits happily.
> 
> http://mynodes.net/pub/linux/netfilter/patchlets/
> 
> This, in fact, redirect to my people.netfilter.org. Please let curl allow
> redirection. 


Thanks. I've CCed Krzysztof Oldzki, who also volunteered for geoip,
since you are the original author I'm going to add your repository.
I think I'll start pushing out stuff later today. I'm not sure if
the way curl is currently used supports redirects, we'll see :)

Re: Maintaining the geoip patchlet

[Krzysztof Oledzki]

On Wed, 10 May 2006, Patrick McHardy wrote:

> Samuel Jean wrote:
>> Patrick --
>>
>> Here's the URL where my index file waits happily.
>>
>> http://mynodes.net/pub/linux/netfilter/patchlets/
>>
>> This, in fact, redirect to my people.netfilter.org. Please let curl allow
>> redirection.
>
>
> Thanks. I've CCed Krzysztof Oldzki, who also volunteered for geoip,
> since you are the original author I'm going to add your repository.
> I think I'll start pushing out stuff later today. I'm not sure if
> the way curl is currently used supports redirects, we'll see :)

Oh, OK :) Anything left for me? ;) If so I would like to request a 
people.netfilter.org account if that is possible as I cannot provide 
reliable and fast enough public ftp server myself.

Thanks.

Best regards,


 			Krzysztof Oledzki

Re: Maintaining the geoip patchlet

[Patrick McHardy]

Krzysztof Oledzki wrote:
>> Thanks. I've CCed Krzysztof Oldzki, who also volunteered for geoip,
>> since you are the original author I'm going to add your repository.
>> I think I'll start pushing out stuff later today. I'm not sure if
>> the way curl is currently used supports redirects, we'll see :)
> 
> 
> Oh, OK :) Anything left for me? ;) If so I would like to request a
> people.netfilter.org account if that is possible as I cannot provide
> reliable and fast enough public ftp server myself.


I still have you on my list for TARPIT, connlimit, ipp2p and time.
Harald takes care of people.netfilter.org accounts, I've CCed him.

Re: Maintaining the geoip patchlet

[Krzysztof Oledzki]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 648 bytes --]



On Fri, 5 May 2006, Samuel Jean wrote:

> Hi,
>
> I've been quite busy past months and couldn't track the geoip status in
> current Linux kernels. I've dropped registration of cookinglinux.org and
> this is why our email addresses don't work anymore. Sorry for that.
>
> Nicolas and I will continue to maintain the geoip match. I am gonna setup
> the repository tonight, after work.
>
> I think this apt-like pom is a great idea.
>
> Keep up the good work.

I attached patch for geoip that makes it usable with 2.6.16.x kernels. It 
also kills warnings about incompatible types. Thanks.

Best regards,

 			Krzysztof Olędzki

[-- Attachment #2: Type: TEXT/PLAIN, Size: 1646 bytes --]

diff -Nur patch-o-matic-ng-20060328-orig/patchlets/geoip/linux-2.6/net/ipv4/netfilter/Makefile.ladd patch-o-matic-ng-20060328/patchlets/geoip/linux-2.6/net/ipv4/netfilter/Makefile.ladd
--- patch-o-matic-ng-20060328-orig/patchlets/geoip/linux-2.6/net/ipv4/netfilter/Makefile.ladd	2005-01-23 16:53:14.000000000 +0100
+++ patch-o-matic-ng-20060328/patchlets/geoip/linux-2.6/net/ipv4/netfilter/Makefile.ladd	2006-03-29 19:17:09.000000000 +0200
@@ -1,3 +1,3 @@
-obj-$(CONFIG_IP_NF_MATCH_LIMIT) += ipt_limit.o
+obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
 obj-$(CONFIG_IP_NF_MATCH_GEOIP) += ipt_geoip.o
 
diff -Nur patch-o-matic-ng-20060328-orig/patchlets/geoip/linux-2.6/net/ipv4/netfilter/ipt_geoip.c patch-o-matic-ng-20060328/patchlets/geoip/linux-2.6/net/ipv4/netfilter/ipt_geoip.c
--- patch-o-matic-ng-20060328-orig/patchlets/geoip/linux-2.6/net/ipv4/netfilter/ipt_geoip.c	2005-01-23 16:53:14.000000000 +0100
+++ patch-o-matic-ng-20060328/patchlets/geoip/linux-2.6/net/ipv4/netfilter/ipt_geoip.c	2006-03-29 19:16:45.000000000 +0200
@@ -99,6 +99,7 @@
                  const struct net_device *out,
                  const void *matchinfo,
                  int offset,
+		 unsigned int protoff,
                  int *hotdrop)
 {
    const struct ipt_geoip_info *info = matchinfo;
@@ -133,7 +134,7 @@
 }
 
 static int geoip_checkentry(const char *tablename,
-                             const struct ipt_ip *ip,
+                             const void *ip,
                              void *matchinfo,
                              unsigned int matchsize,
                              unsigned int hook_mask)