0115-Update-to-new-struct-frec-fields-in-conntrack-code.patch 1.1 KB

1234567891011121314151617181920212223242526272829
  1. From cc0b4489c782f6b90ca118abb18e716a7a831289 Mon Sep 17 00:00:00 2001
  2. From: Simon Kelley <simon@thekelleys.org.uk>
  3. Date: Fri, 15 Jan 2021 22:21:52 +0000
  4. Subject: Update to new struct frec fields in conntrack code.
  5. ---
  6. src/forward.c | 4 ++--
  7. 1 file changed, 2 insertions(+), 2 deletions(-)
  8. --- a/src/forward.c
  9. +++ b/src/forward.c
  10. @@ -530,7 +530,7 @@ static int forward_query(int udpfd, unio
  11. if (option_bool(OPT_CONNTRACK))
  12. {
  13. unsigned int mark;
  14. - if (get_incoming_mark(&forward->source, &forward->dest, 0, &mark))
  15. + if (get_incoming_mark(&forward->frec_src.source, &forward->frec_src.dest, 0, &mark))
  16. setsockopt(fd, SOL_SOCKET, SO_MARK, &mark, sizeof(unsigned int));
  17. }
  18. #endif
  19. @@ -1178,7 +1178,7 @@ void reply_query(int fd, int family, tim
  20. if (option_bool(OPT_CONNTRACK))
  21. {
  22. unsigned int mark;
  23. - if (get_incoming_mark(&orig->source, &orig->dest, 0, &mark))
  24. + if (get_incoming_mark(&orig->frec_src.source, &orig->frec_src.dest, 0, &mark))
  25. setsockopt(fd, SOL_SOCKET, SO_MARK, &mark, sizeof(unsigned int));
  26. }
  27. #endif