OpenBSD CVS

CVS log for src/usr.bin/rsync/blocks.c


[BACK] Up to [local] / src / usr.bin / rsync

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.23 / (download) - annotate - [select for diffs], Wed Feb 28 09:36:11 2024 UTC (2 months, 2 weeks ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE, OPENBSD_7_5, HEAD
Changes since 1.22: +40 -51 lines
Diff to previous 1.22 (colored)

Refactor blk_match(). Fold the remaining data and empty file or no blocks
cases together since they are kind of the same.

OK tb@

Revision 1.22 / (download) - annotate - [select for diffs], Tue Feb 27 11:28:30 2024 UTC (2 months, 2 weeks ago) by claudio
Branch: MAIN
Changes since 1.21: +8 -1 lines
Diff to previous 1.21 (colored)

Split hash_file into three steps, setup, add buf and final.

Setup inits the context and adds the seed. The buf function simply adds
a block from the file to the hash. The final function calls MD4_Final()
to close the context and generate the hash.

This will help to remove the mmap in the sender and should result in a
more atomic view of the file since hash_file() is now called together
with the other hash_functions.

OK deraadt@ tb@

Revision 1.19.4.1 / (download) - annotate - [select for diffs], Tue Nov 9 13:41:24 2021 UTC (2 years, 6 months ago) by benno
Branch: OPENBSD_6_9
Changes since 1.19: +8 -8 lines
Diff to previous 1.19 (colored) next main 1.20 (colored)

rpki-client(8) should handle CA misbehaviours as soft-errors.

This is a merge of usr.sbin/rpki-client and usr.bin/rsync from current
and includes all commits in rpki-client 7.5 up to Tue Nov 9 11:03:40
2021 and to openrsync up to Wed Nov 3 14:42:13 2021, including:

* Make rpki-client more resilient regarding untrusted input:
  - fail repository synchronisation after 15min runtime
  - limit the number of publication points per TAL
  - don't allow DOCTYPE definitions in RRDP XML files
  - fix detection of HTTP redirect loops.
* limit the number of concurrent rsync processes.
* fix CRLF in tal files.

This is patches/6.9/common/021_rpki.patch.sig

Revision 1.20.2.1 / (download) - annotate - [select for diffs], Tue Nov 9 13:40:41 2021 UTC (2 years, 6 months ago) by benno
Branch: OPENBSD_7_0
Changes since 1.20: +8 -8 lines
Diff to previous 1.20 (colored) next main 1.21 (colored)

rpki-client(8) should handle CA misbehaviours as soft-errors.

This is a merge of usr.sbin/rpki-client and usr.bin/rsync from current
and includes all commits in rpki-client 7.5 up to Tue Nov 9 11:03:40
2021 and to openrsync up to Wed Nov 3 14:42:13 2021, including:

* Make rpki-client more resilient regarding untrusted input:
  - fail repository synchronisation after 15min runtime
  - limit the number of publication points per TAL
  - don't allow DOCTYPE definitions in RRDP XML files
  - fix detection of HTTP redirect loops.
* limit the number of concurrent rsync processes.
* fix CRLF in tal files.

This is patches/7.0/common/004_rpki.patch.sig

Revision 1.21 / (download) - annotate - [select for diffs], Wed Nov 3 14:42:12 2021 UTC (2 years, 6 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_7_4_BASE, OPENBSD_7_4, OPENBSD_7_3_BASE, OPENBSD_7_3, OPENBSD_7_2_BASE, OPENBSD_7_2, OPENBSD_7_1_BASE, OPENBSD_7_1
Changes since 1.20: +8 -8 lines
Diff to previous 1.20 (colored)

whitespace observed during a read-through

Revision 1.20 / (download) - annotate - [select for diffs], Wed Jun 30 13:10:04 2021 UTC (2 years, 10 months ago) by claudio
Branch: MAIN
CVS Tags: OPENBSD_7_0_BASE
Branch point for: OPENBSD_7_0
Changes since 1.19: +1 -1 lines
Diff to previous 1.19 (colored)

Replace Id: tags with OpenBSD: tags
OK deraadt@

Revision 1.19 / (download) - annotate - [select for diffs], Sun Jun 2 17:43:34 2019 UTC (4 years, 11 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_9_BASE, OPENBSD_6_8_BASE, OPENBSD_6_8, OPENBSD_6_7_BASE, OPENBSD_6_7, OPENBSD_6_6_BASE, OPENBSD_6_6
Branch point for: OPENBSD_6_9
Changes since 1.18: +5 -7 lines
Diff to previous 1.18 (colored)

KNF and sneaky whitespaces

Revision 1.18 / (download) - annotate - [select for diffs], Sun Jun 2 17:36:48 2019 UTC (4 years, 11 months ago) by florian
Branch: MAIN
Changes since 1.17: +164 -42 lines
Diff to previous 1.17 (colored)

Use a simple hash table to look up blocks by the fast-hash.  Also use
a rolling computation for the fast-hash.OB With this openrsync is on
par with gpl rsync for file updates.
From kristaps

Revision 1.17 / (download) - annotate - [select for diffs], Sun Jun 2 14:30:51 2019 UTC (4 years, 11 months ago) by deraadt
Branch: MAIN
Changes since 1.16: +1 -2 lines
Diff to previous 1.16 (colored)

have_md is initialized at startup, don't need to do it again later
from Hiltjo Posthuma

Revision 1.16 / (download) - annotate - [select for diffs], Wed May 8 21:30:11 2019 UTC (5 years ago) by benno
Branch: MAIN
Changes since 1.15: +18 -20 lines
Diff to previous 1.15 (colored)

remove sess argument from all functions that only used it for logging
functions.
ok deraadt@

Revision 1.15 / (download) - annotate - [select for diffs], Wed May 8 20:00:25 2019 UTC (5 years ago) by benno
Branch: MAIN
Changes since 1.14: +29 -30 lines
Diff to previous 1.14 (colored)

remove sess argument from log functions. ok deraadt@

Revision 1.14 / (download) - annotate - [select for diffs], Sat Mar 23 16:04:28 2019 UTC (5 years, 1 month ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_6_5_BASE, OPENBSD_6_5
Changes since 1.13: +25 -24 lines
Diff to previous 1.13 (colored)

indents and reflows around ERR*() and LOG*(); ok benno

Revision 1.13 / (download) - annotate - [select for diffs], Mon Feb 18 22:47:34 2019 UTC (5 years, 3 months ago) by benno
Branch: MAIN
Changes since 1.12: +7 -16 lines
Diff to previous 1.12 (colored)

new attempt to sync with kristaps up to Sun Feb 17 2019

339cf5998c0c022623cd68de50722b6c14543952 Push "error trail" further into code.

baf58ce5fe1bc6ce431b3b0ac8264b83ae8c7d02 Document all arguments.  Add
common -av usage.  Remove bits about not supporting anything but
files/dirs.

821a811a8c80e52fb56b241fc65a16cae1b4fb2c Disambiguate as prodded by deraadt@

6c4475b8f226e9031ec0ec1b3f14f7d347132c87 Add -h to usage string

4d344ae6156873b44c95de0c1ed629e637c2d7ab Clarify error message
language, use service name instead of port, specify that the socket is
SOCK_STREAM.  From deraadt@.  Tweaked for lowercase messages.

f3ec049e76257fc96bcdc872f1d3b967b98f3eb6 In consideration to benno@'s
comments, let the mktemp functions propogate an errno handled by the
caller.  Also keep the original line lengths.  While in mktemp.c, make
some defines into an enum.

e116c2bd00e634b56e4276120135915ceaa31cf2 Put the FSM of the sender
into its own function.  Put dry_run ack and end of phase ack into the
send buffer too, further reducing the possibility of deadlock.

c7745aa4c7394ca89d841f8ee76782256d694340 Make the sender write loop be
fully non-blocking.  This frees us of deadlocking the protocol because
the sender will always be able to pull down data.

93c7b4843e80aeac2ec6ae6ffc395df4deaf4a31 Remove "yoda" notation to be
more in tune with OpenBSD.  Most found by deraadt@.

Revision 1.12 / (download) - annotate - [select for diffs], Mon Feb 18 21:55:27 2019 UTC (5 years, 3 months ago) by benno
Branch: MAIN
Changes since 1.11: +16 -7 lines
Diff to previous 1.11 (colored)

revert previous

Revision 1.11 / (download) - annotate - [select for diffs], Mon Feb 18 21:34:54 2019 UTC (5 years, 3 months ago) by benno
Branch: MAIN
Changes since 1.10: +7 -16 lines
Diff to previous 1.10 (colored)

sync with kristaps up to Sun Feb 17 2019

339cf5998c0c022623cd68de50722b6c14543952 Push "error trail" further into code.

baf58ce5fe1bc6ce431b3b0ac8264b83ae8c7d02 Document all arguments.  Add
  common -av usage.  Remove bits about not supporting anything but
  files/dirs.

821a811a8c80e52fb56b241fc65a16cae1b4fb2c Disambiguate as prodded by deraadt@

6c4475b8f226e9031ec0ec1b3f14f7d347132c87 Add -h to usage string

4d344ae6156873b44c95de0c1ed629e637c2d7ab Clarify error message
  language, use service name instead of port, specify that the socket is
  SOCK_STREAM.  From deraadt@.  Tweaked for lowercase messages.

f3ec049e76257fc96bcdc872f1d3b967b98f3eb6 In consideration to benno@'s
  comments, let the mktemp functions propogate an errno handled by the
  caller.  Also keep the original line lengths.  While in mktemp.c, make
  some defines into an enum.

e116c2bd00e634b56e4276120135915ceaa31cf2 Put the FSM of the sender
  into its own function.  Put dry_run ack and end of phase ack into the
  send buffer too, further reducing the possibility of deadlock.

c7745aa4c7394ca89d841f8ee76782256d694340 Make the sender write loop be
  fully non-blocking.  This frees us of deadlocking the protocol because
  the sender will always be able to pull down data.

93c7b4843e80aeac2ec6ae6ffc395df4deaf4a31 Remove "yoda" notation to be
  more in tune with OpenBSD.  Most found by deraadt@.

Revision 1.10 / (download) - annotate - [select for diffs], Sun Feb 17 16:34:04 2019 UTC (5 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.9: +2 -2 lines
Diff to previous 1.9 (colored)

more yoda repairs

Revision 1.9 / (download) - annotate - [select for diffs], Sat Feb 16 16:58:39 2019 UTC (5 years, 3 months ago) by florian
Branch: MAIN
Changes since 1.8: +64 -142 lines
Diff to previous 1.8 (colored)

sync with kristaps, commit 1842d31d600f2834ae78fe0d99a29519a853d75c
Make sender mostly nonblocking for writes.  This takes a lot of logic once
in blocks.c and puts it directly into sender.c.  It allows running openrsync
against itself without deadlocks.

Revision 1.8 / (download) - annotate - [select for diffs], Sat Feb 16 16:57:48 2019 UTC (5 years, 3 months ago) by florian
Branch: MAIN
Changes since 1.7: +21 -15 lines
Diff to previous 1.7 (colored)

sync with kristaps, commit d7c4fb8ac88845aa08900d5d0ec469257f63a339
Use a static single block instead of multiple writes.

Revision 1.7 / (download) - annotate - [select for diffs], Sat Feb 16 16:57:17 2019 UTC (5 years, 3 months ago) by florian
Branch: MAIN
Changes since 1.6: +47 -217 lines
Diff to previous 1.6 (colored)

sync with kristaps, commit f5c1e234990877cd274b7bcdd4d9883104cd1568
Make sender have reentrant sending and prioritised reading.  This way,
the sender gets data off the wire as quickly as possible.  While here,
remove dead wood from blocks.c (blk_merge).

Revision 1.6 / (download) - annotate - [select for diffs], Wed Feb 13 05:41:35 2019 UTC (5 years, 3 months ago) by tb
Branch: MAIN
Changes since 1.5: +3 -2 lines
Diff to previous 1.5 (colored)

Use md4 from libcrypto instead of using a compatible re-implementation.

ok benno, deraadt

Revision 1.5 / (download) - annotate - [select for diffs], Mon Feb 11 22:22:52 2019 UTC (5 years, 3 months ago) by benno
Branch: MAIN
Changes since 1.4: +11 -14 lines
Diff to previous 1.4 (colored)

fix an fd leak in blk_match()
from Hiltjo Posthuma hiltjo AT codemadness DOT org, thanks.

Revision 1.4 / (download) - annotate - [select for diffs], Mon Feb 11 21:41:22 2019 UTC (5 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.3: +19 -20 lines
Diff to previous 1.3 (colored)

swap comparison arguments as needed, to match idiomatic C most of us
are familiar with.  Proofed by florian and benno

Revision 1.3 / (download) - annotate - [select for diffs], Mon Feb 11 19:18:36 2019 UTC (5 years, 3 months ago) by deraadt
Branch: MAIN
Changes since 1.2: +29 -29 lines
Diff to previous 1.2 (colored)

cleanup weird spaces around !.  (We normalize source-code to a standard
idiom because it is less error prone for a larger team.  kristaps idiom
is highly divergent)
ok benno

Revision 1.2 / (download) - annotate - [select for diffs], Sun Feb 10 23:24:14 2019 UTC (5 years, 3 months ago) by benno
Branch: MAIN
Changes since 1.1: +13 -13 lines
Diff to previous 1.1 (colored)

fix whitespace

Revision 1.1 / (download) - annotate - [select for diffs], Sun Feb 10 23:18:28 2019 UTC (5 years, 3 months ago) by benno
Branch: MAIN

Import Kristaps' openrsync into the tree.
OK deraadt@

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.