Merge branch 'develop'

diff --git a/README b/README
index be8ac6ba5faf0e6fe2b4ec18dbd5110e9de81b2d..3445eee7f688692518d1b47547c89db5af6490c2 100644 (file)
--- a/README
+++ b/README
@@ -18,6 +18,8 @@ conditions. It should work on all POSIX-compatible systems. Easy
 integration with existing SMTP servers. Single YAML configuration file.
 
 Home page: http://www.nncpgo.org/
+Also available as I2P service:
+http://ryeyslcg6oajmyruje3weqayepze5e5oglxndhkavzfatgnxcd7q.b32.i2p/
 
 Please send questions regarding the use of NNCP, bug reports and
 patches to nncp-devel mailing list:

diff --git a/README.RU b/README.RU
index 466ca105233f2af6b4b62f7475a43f3433c5a0b4..ad26251fd3dae90da61ac35cf494b634bbe9516b 100644 (file)
--- a/README.RU
+++ b/README.RU
@@ -23,6 +23,8 @@ NNCP это свободное программное обеспечением:
 конфигурационный YAML файл.
 
 Домашняя страница: http://www.nncpgo.org/
+Также доступная как I2P сервис:
+http://ryeyslcg6oajmyruje3weqayepze5e5oglxndhkavzfatgnxcd7q.b32.i2p/
 
 Пожалуйста все вопросы касающиеся использования NNCP, отчёты об ошибках
 и патчи отправляйте в nncp-devel почтовую рассылку:

diff --git a/VERSION b/VERSION
index 68c123cf10e0a36b6036c9fbc30275960d19e749..51176c7c891c45403eab9e0cf753cbab19dc2442 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.10
+0.11

diff --git a/doc/contacts.texi b/doc/contacts.texi
index 473df97e9c1dc508ad07b7e13d285034873f7aac..4c06d4548dc84214844243aa44c96b9704de4d8f 100644 (file)
--- a/doc/contacts.texi
+++ b/doc/contacts.texi
@@ -5,4 +5,6 @@ Please send questions regarding the use of NNCP, bug reports and patches to
 @url{https://lists.cypherpunks.ru/pipermail/nncp-devel/, nncp-devel}
 mailing list. Announcements also go to this mailing list.
 
-Official website is @url{http://www.nncpgo.org/}.
+Official website is @url{http://www.nncpgo.org/}, also available as
+@url{https://geti2p.net/en/, I2P} service
+@url{http://ryeyslcg6oajmyruje3weqayepze5e5oglxndhkavzfatgnxcd7q.b32.i2p/}.

diff --git a/doc/download.texi b/doc/download.texi
index f4acf66d8c90b045858ceac17582cd9c2d1cf608..fef33eaec9a1b3655a0f2c7310fd64563d2aa39e 100644 (file)
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -1,15 +1,14 @@
 @node Tarballs
 @section Prepared tarballs
 
-You can obtain releases source code prepared tarballs from the links below
-(or use @url{https://sourceforge.net/projects/nncp/files/, Sourceforge mirror}).
+You can obtain releases source code prepared tarballs from the links below.
 Do not forget to check tarball @ref{Integrity, integrity}.
 
 Tarballs include all necessary required libraries:
 
 @multitable @columnfractions .50 .50
 @headitem Library @tab Licence
-@item @code{cypherpunks.ru/balloon} @tab GNU GPLv3+
+@item @code{cypherpunks.ru/balloon} @tab GNU LGPLv3+
 @item @code{github.com/dustin/go-humanize} @tab MIT
 @item @code{github.com/flynn/noise} @tab BSD 3-Clause
 @item @code{github.com/go-check/check} @tab BSD 2-Clause
@@ -24,6 +23,10 @@ Tarballs include all necessary required libraries:
 @multitable {XXXXX} {XXXX KiB} {link sign} {xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx}
 @headitem Version @tab Size @tab Tarball @tab SHA256 checksum
 
+@item @ref{Release 0.10, 0.10} @tab 949 KiB
+@tab @url{download/nncp-0.10.tar.xz, link} @url{download/nncp-0.10.tar.xz.sig, sign}
+@tab @code{DCE7C762 2F9281EB 282F1A67 5CA6500E 854F2DEC D60F3264 07872B91 4F4E6FA0}
+
 @item @ref{Release 0.9, 0.9} @tab 942 KiB
 @tab @url{download/nncp-0.9.tar.xz, link} @url{download/nncp-0.9.tar.xz.sig, sign}
 @tab @code{8D0765A5 F9D81086 7E1F5AB4 52A9464D C5035CCB 4E09A29A 9C9A4934 1A72AB2C}
@@ -62,3 +65,5 @@ Tarballs include all necessary required libraries:
 @tab @code{8F71D65B 70865EBF FE802CDF A5C14D00 A9FD6559 FD722E60 5D97E82C 5E2412C2}
 
 @end multitable
+
+Also you can try its @ref{Contacts, .i2p} version.

diff --git a/doc/news.ru.texi b/doc/news.ru.texi
index 0b061c90b4a8cabd3248ac35b5f8c20b13779b39..f738d0e676a8b4ffaff78b7ba6851b0fd49dc441 100644 (file)
--- a/doc/news.ru.texi
+++ b/doc/news.ru.texi
@@ -1,6 +1,13 @@
 @node Новости
 @section Новости
 
+@node Релиз 0.11
+@subsection Релиз 0.11
+@itemize
+@item
+Вывод команды @command{nncp-stat} отсортирован по имены ноды.
+@end itemize
+
 @node Релиз 0.10
 @subsection Релиз 0.10
 @itemize

diff --git a/doc/news.texi b/doc/news.texi
index 1853f21e298ad4f05deb0fd8a7cff6e5a7a44fd4..8c3ec1a3b4548eebe9edf8d475d6f1bda74f15bb 100644 (file)
--- a/doc/news.texi
+++ b/doc/news.texi
@@ -3,6 +3,13 @@
 
 See also this page @ref{Новости, on russian}.
 
+@node Release 0.11
+@section Release 0.11
+@itemize
+@item
+@command{nncp-stat}'s command output is sorted by node name.
+@end itemize
+
 @node Release 0.10
 @section Release 0.10
 @itemize

diff --git a/makedist.sh b/makedist.sh
index a68f4365515873561c4e2247854ca798b836df77..afaecd10cb812c239d53d6abc8039bec83cf319b 100755 (executable)
--- a/makedist.sh
+++ b/makedist.sh
@@ -126,6 +126,8 @@ $(git cat-file -p $release | sed -n '6,/^.*BEGIN/p' | sed '$d')
 ------------------------ >8 ------------------------
 
 NNCP's home page is: http://www.nncpgo.org/
+Also available as I2P service:
+http://ryeyslcg6oajmyruje3weqayepze5e5oglxndhkavzfatgnxcd7q.b32.i2p/
 
 Source code and its signature for that version can be found here:
 
@@ -173,6 +175,8 @@ $(git cat-file -p $release | sed -n '6,/^.*BEGIN/p' | sed '$d')
 ------------------------ >8 ------------------------
 
 Домашняя страница NNCP: http://www.nncpgo.org/
+Также доступная как I2P сервис:
+http://ryeyslcg6oajmyruje3weqayepze5e5oglxndhkavzfatgnxcd7q.b32.i2p/
 Коротко об утилитах: http://www.nncpgo.org/Ob-utilitakh.html
 
 Исходный код и его подпись для этой версии находятся здесь:

diff --git a/ports/nncp/Makefile b/ports/nncp/Makefile
index 49a463a95358841ae817e164be4777b16a57c723..7d131213c57c60a57d87fcc25f1b126aa6b17302 100644 (file)
--- a/ports/nncp/Makefile
+++ b/ports/nncp/Makefile
@@ -3,8 +3,7 @@
 PORTNAME=      nncp
 PORTVERSION=   0.10
 CATEGORIES=    net
-MASTER_SITES=  http://www.nncpgo.org/download/ \
-               http://sourceforge.net/projects/nncp/files/
+MASTER_SITES=  http://www.nncpgo.org/download/
 
 MAINTAINER=    stargrave@stargrave.org
 COMMENT=       Utilities for secure store-and-forward files and mail exchanging

diff --git a/src/cypherpunks.ru/balloon b/src/cypherpunks.ru/balloon
index 2be074075c635f95406490655039988c8e3633d8..3cd3006ad829a0afc7ca3d964ff333ef068464bd 160000 (submodule)
--- a/src/cypherpunks.ru/balloon
+++ b/src/cypherpunks.ru/balloon
@@ -1 +1 @@
-Subproject commit 2be074075c635f95406490655039988c8e3633d8
+Subproject commit 3cd3006ad829a0afc7ca3d964ff333ef068464bd

diff --git a/src/cypherpunks.ru/nncp/cmd/nncp-stat/main.go b/src/cypherpunks.ru/nncp/cmd/nncp-stat/main.go
index f5b02875ef36675e213faccc6767c8b4ada10674..0c27b1b8d27f4ae0940d806cf539c29e0d139a39 100644 (file)
--- a/src/cypherpunks.ru/nncp/cmd/nncp-stat/main.go
+++ b/src/cypherpunks.ru/nncp/cmd/nncp-stat/main.go
@@ -25,6 +25,7 @@ import (
        "io/ioutil"
        "log"
        "os"
+       "sort"
 
        "cypherpunks.ru/nncp"
        "github.com/dustin/go-humanize"
@@ -74,20 +75,30 @@ func main() {
                }
        }
 
-       for nodeId, node := range ctx.Neigh {
-               if nodeOnly != nil && nodeId != *nodeOnly.Id {
+       nodeNames := make([]string, 0, len(ctx.Neigh))
+       nodeNameToNode := make(map[string]*nncp.Node, len(ctx.Neigh))
+       for _, node := range ctx.Neigh {
+               nodeNames = append(nodeNames, node.Name)
+               nodeNameToNode[node.Name] = node
+       }
+       sort.Strings(nodeNames)
+
+       var node *nncp.Node
+       for _, nodeName := range nodeNames {
+               node = nodeNameToNode[nodeName]
+               if nodeOnly != nil && *node.Id != *nodeOnly.Id {
                        continue
                }
                rxNums := make(map[uint8]int)
                rxBytes := make(map[uint8]int64)
-               for job := range ctx.Jobs(&nodeId, nncp.TRx) {
+               for job := range ctx.Jobs(node.Id, nncp.TRx) {
                        job.Fd.Close()
                        rxNums[job.PktEnc.Nice] = rxNums[job.PktEnc.Nice] + 1
                        rxBytes[job.PktEnc.Nice] = rxBytes[job.PktEnc.Nice] + job.Size
                }
                txNums := make(map[uint8]int)
                txBytes := make(map[uint8]int64)
-               for job := range ctx.Jobs(&nodeId, nncp.TTx) {
+               for job := range ctx.Jobs(node.Id, nncp.TTx) {
                        job.Fd.Close()
                        txNums[job.PktEnc.Nice] = txNums[job.PktEnc.Nice] + 1
                        txBytes[job.PktEnc.Nice] = txBytes[job.PktEnc.Nice] + job.Size

diff --git a/src/github.com/flynn/noise b/src/github.com/flynn/noise
index c90ff622305fbe90de9cdc3a23a85b966e09c929..01cefa3e208b7260892d831b38b44bdbfd0f9f26 160000 (submodule)
--- a/src/github.com/flynn/noise
+++ b/src/github.com/flynn/noise
@@ -1 +1 @@
-Subproject commit c90ff622305fbe90de9cdc3a23a85b966e09c929
+Subproject commit 01cefa3e208b7260892d831b38b44bdbfd0f9f26

diff --git a/src/golang.org/x/crypto b/src/golang.org/x/crypto
index 69be088f860613049aa58c65154d1b1d32bbdf90..eb71ad9bd329b5ac0fd0148dd99bd62e8be8e035 160000 (submodule)
--- a/src/golang.org/x/crypto
+++ b/src/golang.org/x/crypto
@@ -1 +1 @@
-Subproject commit 69be088f860613049aa58c65154d1b1d32bbdf90
+Subproject commit eb71ad9bd329b5ac0fd0148dd99bd62e8be8e035

diff --git a/src/golang.org/x/net b/src/golang.org/x/net
index 1f9224279e98554b6a6432d4dd998a739f8b2b7c..1c05540f6879653db88113bc4a2b70aec4bd491f 160000 (submodule)
--- a/src/golang.org/x/net
+++ b/src/golang.org/x/net
@@ -1 +1 @@
-Subproject commit 1f9224279e98554b6a6432d4dd998a739f8b2b7c
+Subproject commit 1c05540f6879653db88113bc4a2b70aec4bd491f

diff --git a/src/golang.org/x/sys b/src/golang.org/x/sys
index 94b76065f2d2081d0fef24a6e67c571f51a6408a..43e60d72a8e2bd92ee98319ba9a384a0e9837c08 160000 (submodule)
--- a/src/golang.org/x/sys
+++ b/src/golang.org/x/sys
@@ -1 +1 @@
-Subproject commit 94b76065f2d2081d0fef24a6e67c571f51a6408a
+Subproject commit 43e60d72a8e2bd92ee98319ba9a384a0e9837c08