Merge branch 'develop'

diff --git a/doc/download.texi b/doc/download.texi
index f7707d97de253b7e01cd57fec473e1c34235113a..30de1737f4ad5580f4c078713142a1ebecc91f29 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -28,6 +28,10 @@ Tarballs include all necessary required libraries:
 @multitable {XXXXX} {XXXX-XX-XX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
 @headitem Version @tab Date @tab Size @tab Tarball @tab SHA256 checksum
 
+@item @ref{Release 7_1_0, 7.1.0} @tab 2021-07-04 @tab 1142 KiB
+@tab @url{download/nncp-7.1.0.tar.xz, link} @url{download/nncp-7.1.0.tar.xz.sig, sign}
+@tab @code{D3BC010F 5D86BB59 E07A2A84 2FF9C73B 4C2F780B 807EF25C E4BC477C E40764A6}
+
 @item @ref{Release 7_0_0, 7.0.0} @tab 2021-06-30 @tab 1123 KiB
 @tab @url{download/nncp-7.0.0.tar.xz, link} @url{download/nncp-7.0.0.tar.xz.sig, sign}
 @tab @code{D4D28E9A CF40FE12 68BDE134 9CD36076 282395BE 70094EFB 0DB75CE8 C32EA664}

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 49cecae57b2947e4dbd08b7636969cd7af264f48..86b0ccc1d4ba151eef55a2d713e5c60da60fb088 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,10 +1,24 @@
 @node Новости
 @section Новости
 
+@node Релиз 7.1.1
+@subsection Релиз 7.1.1
+@itemize
+
+@item
+Исправлено падение при fsync директорий после создания @file{.seen} файлов.
+
+@end itemize
+
 @node Релиз 7.1.0
 @subsection Релиз 7.1.0
 @itemize
 
+@item
+Появилась возможность мультивещательной (multicast) рассылки пакетов.
+Реализовано всего лишь дополнительным типом простых пакетов и изменением
+@command{nncp-toss}, @command{nncp-file} и @command{nncp-exec} команд.
+
 @item
 Исправлена работоспособность @command{nncp-file} и @command{nncp-exec}
 команд использующих временный файл (stdin и @option{-use-tmp}).
@@ -30,11 +44,6 @@
 @item
 @command{nncp-pkt} может парсить @file{.hdr} файлы.
 
-@item
-Появилась возможность мультивещательной (multicast) рассылки пакетов.
-Реализовано всего лишь дополнительным типом простых пакетов и изменением
-@command{nncp-toss}, @command{nncp-file} и @command{nncp-exec} команд.
-
 @end itemize
 
 @node Релиз 7.0.0

diff --git a/doc/news.texi b/doc/news.texi
index ebfd8c7902429bfaca2177cbd3f8ec0c7796704d..731d8ef53d00f0a7aa0736f7270f7deedb947497 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,10 +3,23 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 7_1_1
+@section Release 7.1.1
+@itemize
+
+@item
+Fixed failing directories fsync after @file{.seen} file creation.
+@end itemize
+
 @node Release 7_1_0
 @section Release 7.1.0
 @itemize
 
+@item
+Multicasting areas feature appeared. Implemented merely by an additional
+plain packet type with @command{nncp-toss}, @command{nncp-file} and
+@command{nncp-exec} commands modification.
+
 @item
 Fixed workability of @command{nncp-file} and @command{nncp-exec}
 commands, that use temporary file (stdin and @option{-use-tmp}).
@@ -31,11 +44,6 @@ the check in infinite cycle.
 @item
 @command{nncp-pkt} can parse @file{.hdr} files.
 
-@item
-Multicasting areas feature appeared. Implemented merely by an additional
-plain packet type with @command{nncp-toss}, @command{nncp-file} and
-@command{nncp-exec} commands modification.
-
 @end itemize
 
 @node Release 7_0_0

diff --git a/doc/pkt/plain.texi b/doc/pkt/plain.texi
index 954b893de28b5f7a95b43c8401f648a265c9f556..211bdd2a8cc74b981a8f406316ad48e946ab66a5 100644 (file)
--- a/doc/pkt/plain.texi
+++ b/doc/pkt/plain.texi
@@ -98,24 +98,24 @@ So plain packets can hold following paths and payloads:
 
 @item exec
 @example
-  +----------------------- PATH -------------------------+   +---- PAYLOAD ---+
- /                                                        \ /                  \
-+----------------------------------------------------------+---------------...--+
-|  HANDLE | ARG0 0x00 ARG1 ...| 0x00 ... variable ... 0x00 |     ZSTD DATA      |
-+----------------------------------------------------------+---------------...--+
- \                           /
-  +-------- PATHLEN --------+
+  +------------------------- PATH ----------------------------+   +---- PAYLOAD ---+
+ /                                                             \ /                  \
++---------------------------------------------------------------+---------------...--+
+|  HANDLE 0x00 | ARG0 0x00 ARG1 ...| 0x00 ... variable ... 0x00 |     ZSTD DATA      |
++---------------------------------------------------------------+---------------...--+
+ \                                /
+  +-------- PATHLEN -------------+
 @end example
 
 @item exec-fat
 @example
-  +----------------------- PATH -------------------------+   +---- PAYLOAD ---+
- /                                                        \ /                  \
-+----------------------------------------------------------+---------------...--+
-|  HANDLE | ARG0 0x00 ARG1 ...| 0x00 ... variable ... 0x00 |        DATA        |
-+----------------------------------------------------------+---------------...--+
- \                           /
-  +-------- PATHLEN --------+
+  +------------------------- PATH ----------------------------+   +---- PAYLOAD ---+
+ /                                                             \ /                  \
++---------------------------------------------------------------+---------------...--+
+|  HANDLE 0x00 | ARG0 0x00 ARG1 ...| 0x00 ... variable ... 0x00 |        DATA        |
++---------------------------------------------------------------+---------------...--+
+ \                                /
+  +-------- PATHLEN -------------+
 @end example
 
 @item trns

diff --git a/src/nncp.go b/src/nncp.go
index d3ad2a73f5ae4c7907b9ab9b67618e2410b5028d..d2042c37f945c30af8c1f659ce5835f959fb9e81 100644 (file)
--- a/src/nncp.go
+++ b/src/nncp.go
@@ -40,7 +40,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.`
 const Base32Encoded32Len = 52
 
 var (
-       Version string = "7.1.0"
+       Version string = "7.1.1"
 
        Base32Codec *base32.Encoding = base32.StdEncoding.WithPadding(base32.NoPadding)
 )

diff --git a/src/toss.go b/src/toss.go
index 6f91b43d799cf87100c96dc69deaf219cdd3aa8e..69ad45536e2ba0427e2ba90b5b9d104e6b924301 100644 (file)
--- a/src/toss.go
+++ b/src/toss.go
@@ -200,7 +200,7 @@ func jobProcess(
                        if doSeen {
                                if fd, err := os.Create(jobPath + SeenSuffix); err == nil {
                                        fd.Close()
-                                       if err = DirSync(filepath.Base(jobPath)); err != nil {
+                                       if err = DirSync(filepath.Dir(jobPath)); err != nil {
                                                ctx.LogE("rx-dirsync", les, err, func(les LEs) string {
                                                        return fmt.Sprintf(
                                                                "Tossing file %s/%s (%s): %s: dirsyncing",
@@ -393,7 +393,7 @@ func jobProcess(
                                if doSeen {
                                        if fd, err := os.Create(jobPath + SeenSuffix); err == nil {
                                                fd.Close()
-                                               if err = DirSync(filepath.Base(jobPath)); err != nil {
+                                               if err = DirSync(filepath.Dir(jobPath)); err != nil {
                                                        ctx.LogE("rx-dirsync", les, err, func(les LEs) string {
                                                                return fmt.Sprintf(
                                                                        "Tossing file %s/%s (%s): %s: dirsyncing",
@@ -518,7 +518,7 @@ func jobProcess(
                                if doSeen {
                                        if fd, err := os.Create(jobPath + SeenSuffix); err == nil {
                                                fd.Close()
-                                               if err = DirSync(filepath.Base(jobPath)); err != nil {
+                                               if err = DirSync(filepath.Dir(jobPath)); err != nil {
                                                        ctx.LogE("rx-dirsync", les, err, func(les LEs) string {
                                                                return fmt.Sprintf(
                                                                        "Tossing file %s/%s (%s): %s: dirsyncing",
@@ -607,7 +607,7 @@ func jobProcess(
                        if doSeen {
                                if fd, err := os.Create(jobPath + SeenSuffix); err == nil {
                                        fd.Close()
-                                       if err = DirSync(filepath.Base(jobPath)); err != nil {
+                                       if err = DirSync(filepath.Dir(jobPath)); err != nil {
                                                ctx.LogE("rx-dirsync", les, err, func(les LEs) string {
                                                        return fmt.Sprintf(
                                                                "Tossing file %s/%s (%s): %s: dirsyncing",