Pf patch

[pier]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

pier wrote:
> hi all.
> I'm trying to apply the patch for pf3.7.
> It compile everything until comes to pfsync
> It gives me this error:
>
>
> cc -O -pipe -march=pentiumpro -DUSE_IF_MEDIA -DINET6 -DUSE_VLANS
> -DUSE_IEEE80211 -DUSE_CARP -DUSE_MAC -DUSE_PFSYNC -DNS -Wall
> -Wmissing-prototypes -Wcast-qual -Wwrite-strings  -Wnested-externs -I..
[...]
Now i'm noticed these rejects:

Patching file ifpfsync.c using Plan A...
Hunk #1 succeeded at 35.
Hunk #2 failed at 46.
Hunk #3 succeeded at 60 (offset -5 lines).
Hunk #4 succeeded at 78 (offset -5 lines).
Hunk #5 failed at 168.
2 out of 5 hunks failed--saving rejects to ifpfsync.c.rej
done


Patching file ifpfsync.c using Plan A...
Reversed (or previously applied) patch detected!  Assume -R? [y] y
Hunk #1 succeeded at 35.
Hunk #2 failed at 45.
Hunk #3 succeeded at 55.
Hunk #4 succeeded at 72.
Hunk #5 failed at 109.
2 out of 5 hunks failed--saving rejects to ifpfsync.c.rej
done

I attach also the two rejects files

Thanx


Pier
- --
Un uomo saggio impara dall' esperienza. Un uomo ancora più saggio impara
dall'esperienza degli altri
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (FreeBSD)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFCeM+P0EvuLV/O0yoRAtcRAKDpm/yOQDPIKzyGIpsewV6wYsp/ZgCg1BB6
BB74QWofHYwLE6qu4Wx9JRA=
=obqz
-----END PGP SIGNATURE-----
-------------- next part --------------
***************
*** 44,56 ****
  
  #include "ifconfig.h"
  
- void setpfsync_syncif(const char *, int, int, const struct afswtch *rafp);
- void unsetpfsync_syncif(const char *, int, int, const struct afswtch *rafp);
- void setpfsync_maxupd(const char *, int, int, const struct afswtch *rafp);
  void pfsync_status(int);
  
  void
- setpfsync_syncif(const char *val, int d, int s, const struct afswtch *rafp)
  {
  	struct pfsyncreq preq;
  
--- 46,61 ----
  
  #include "ifconfig.h"
  
+ void setpfsync_syncdev(const char *, int, int, const struct afswtch *);
+ void unsetpfsync_syncdev(const char *, int, int, const struct afswtch *);
+ void setpfsync_syncpeer(const char *, int, int, const struct afswtch *);
+ void unsetpfsync_syncpeer(const char *, int, int, const struct afswtch *);
+ void setpfsync_syncpeer(const char *, int, int, const struct afswtch *);
+ void setpfsync_maxupd(const char *, int, int, const struct afswtch *);
  void pfsync_status(int);
  
  void
+ setpfsync_syncdev(const char *val, int d, int s, const struct afswtch *rafp)
  {
  	struct pfsyncreq preq;
  
***************
*** 109,124 ****
  	if (ioctl(s, SIOCGETPFSYNC, (caddr_t)&ifr) == -1)
  		return;
  
- 	if (preq.pfsyncr_syncif[0] != '\0') {
- 		printf("\tpfsync: syncif: %s maxupd: %d\n",
- 		    preq.pfsyncr_syncif, preq.pfsyncr_maxupdates);
  	}
  }
  
  static struct cmd pfsync_cmds[] = {
- 	DEF_CMD_ARG("syncif",		setpfsync_syncif),
- 	DEF_CMD_ARG("maxupd",		setpfsync_maxupd),
- 	DEF_CMD("-syncif",	1,	unsetpfsync_syncif),
  };
  static struct afswtch af_pfsync = {
  	.af_name	= "af_pfsync",
--- 168,190 ----
  	if (ioctl(s, SIOCGETPFSYNC, (caddr_t)&ifr) == -1)
  		return;
  
+ 	if (preq.pfsyncr_syncdev[0] != '\0') {
+ 		printf("\tpfsync: syncdev: %s ", preq.pfsyncr_syncdev);
+ 		if (preq.pfsyncr_syncpeer.s_addr != INADDR_PFSYNC_GROUP)
+ 			printf("syncpeer: %s ",
+ 			    inet_ntoa(preq.pfsyncr_syncpeer));
+ 		printf("maxupd: %d\n", preq.pfsyncr_maxupdates);
  	}
  }
  
  static struct cmd pfsync_cmds[] = {
+ 	DEF_CMD_ARG("syncdev",		setpfsync_syncdev),
+ 	DEF_CMD("-syncdev",	1,	unsetpfsync_syncdev),
+ 	DEF_CMD_ARG("syncif",		setpfsync_syncdev),
+ 	DEF_CMD("-syncif",	1,	unsetpfsync_syncdev),
+ 	DEF_CMD_ARG("syncpeer",		setpfsync_syncpeer),
+ 	DEF_CMD("-syncpeer",	1,	unsetpfsync_syncpeer),
+ 	DEF_CMD_ARG("maxupd",		setpfsync_maxupd)
  };
  static struct afswtch af_pfsync = {
  	.af_name	= "af_pfsync",