From eef1aebe8c854945aacffa72cf29892a4f7f4783 Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Tue, 13 Jan 2015 13:22:56 +0100 Subject: [PATCH] Refactor out protocol and luhn (protocol dependency) packages --- Godeps/.gitignore | 3 + Godeps/Godeps.json | 8 + .../src/github.com/calmh/luhn/LICENSE | 19 + .../src/github.com/calmh}/luhn/luhn.go | 15 +- .../src/github.com/calmh}/luhn/luhn_test.go | 17 +- .../github.com/syncthing}/protocol/.gitignore | 0 .../src/github.com/syncthing/protocol/AUTHORS | 4 + .../syncthing/protocol/CONTRIBUTING.md | 76 ++ .../src/github.com/syncthing/protocol/LICENSE | 674 ++++++++++++++++++ .../github.com/syncthing/protocol/README.md | 13 + .../syncthing}/protocol/common_test.go | 0 .../syncthing}/protocol/counting.go | 0 .../github.com/syncthing}/protocol/debug.go | 0 .../syncthing}/protocol/deviceid.go | 2 +- .../syncthing}/protocol/deviceid_test.go | 0 .../src/github.com/syncthing}/protocol/doc.go | 0 .../github.com/syncthing}/protocol/header.go | 0 .../github.com/syncthing}/protocol/message.go | 0 .../syncthing}/protocol/message_xdr.go | 0 .../syncthing}/protocol/nativemodel_darwin.go | 0 .../syncthing}/protocol/nativemodel_unix.go | 0 .../protocol/nativemodel_windows.go | 0 .../syncthing}/protocol/protocol.go | 0 .../syncthing}/protocol/protocol_test.go | 0 .../syncthing}/protocol/wireformat.go | 0 cmd/stfileinfo/main.go | 2 +- cmd/stfinddevice/main.go | 2 +- cmd/stindex/main.go | 2 +- cmd/syncthing/gui.go | 2 +- cmd/syncthing/main.go | 2 +- cmd/syncthing/main_test.go | 2 +- cmd/syncthing/perfstats_unix.go | 2 +- internal/config/config.go | 2 +- internal/config/config_test.go | 2 +- internal/config/wrapper.go | 2 +- internal/db/blockmap.go | 2 +- internal/db/blockmap_test.go | 2 +- internal/db/leveldb.go | 2 +- internal/db/set.go | 2 +- internal/db/set_test.go | 2 +- internal/db/truncated.go | 2 +- internal/discover/client.go | 2 +- internal/discover/client_test.go | 2 +- internal/discover/client_udp.go | 2 +- internal/discover/discover.go | 2 +- internal/discover/discover_test.go | 2 +- internal/model/deviceactivity.go | 2 +- internal/model/deviceactivity_test.go | 2 +- internal/model/model.go | 2 +- internal/model/model_test.go | 2 +- internal/model/puller.go | 2 +- internal/model/puller_test.go | 2 +- internal/model/sharedpullerstate.go | 2 +- internal/scanner/blockqueue.go | 2 +- internal/scanner/blocks.go | 2 +- internal/scanner/blocks_test.go | 2 +- internal/scanner/walk.go | 2 +- internal/scanner/walk_test.go | 2 +- internal/stats/device.go | 2 +- internal/symlinks/symlink_unix.go | 2 +- internal/symlinks/symlink_windows.go | 2 +- test/filetype_test.go | 2 +- test/manypeers_test.go | 2 +- test/symlink_test.go | 2 +- test/sync_test.go | 2 +- 65 files changed, 841 insertions(+), 70 deletions(-) create mode 100644 Godeps/.gitignore create mode 100644 Godeps/_workspace/src/github.com/calmh/luhn/LICENSE rename {internal => Godeps/_workspace/src/github.com/calmh}/luhn/luhn.go (69%) rename {internal => Godeps/_workspace/src/github.com/calmh}/luhn/luhn_test.go (58%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/.gitignore (100%) create mode 100644 Godeps/_workspace/src/github.com/syncthing/protocol/AUTHORS create mode 100644 Godeps/_workspace/src/github.com/syncthing/protocol/CONTRIBUTING.md create mode 100644 Godeps/_workspace/src/github.com/syncthing/protocol/LICENSE create mode 100644 Godeps/_workspace/src/github.com/syncthing/protocol/README.md rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/common_test.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/counting.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/debug.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/deviceid.go (98%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/deviceid_test.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/doc.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/header.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/message.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/message_xdr.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/nativemodel_darwin.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/nativemodel_unix.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/nativemodel_windows.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/protocol.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/protocol_test.go (100%) rename {internal => Godeps/_workspace/src/github.com/syncthing}/protocol/wireformat.go (100%) diff --git a/Godeps/.gitignore b/Godeps/.gitignore new file mode 100644 index 000000000..b9d8baf5d --- /dev/null +++ b/Godeps/.gitignore @@ -0,0 +1,3 @@ +!syncthing +pkg +dev diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index cc336bf85..6c28ff31b 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -17,6 +17,10 @@ "ImportPath": "github.com/calmh/logger", "Rev": "f50d32b313bec2933a3e1049f7416a29f3413d29" }, + { + "ImportPath": "github.com/calmh/luhn", + "Rev": "0c8388ff95fa92d4094011e5a04fc99dea3d1632" + }, { "ImportPath": "github.com/calmh/osext", "Rev": "9bf61584e5f1f172e8766ddc9022d9c401faaa5e" @@ -29,6 +33,10 @@ "ImportPath": "github.com/juju/ratelimit", "Rev": "f9f36d11773655c0485207f0ad30dc2655f69d56" }, + { + "ImportPath": "github.com/syncthing/protocol", + "Rev": "4833b6085c5b152914620d5fa70e548fdd019ca7" + }, { "ImportPath": "github.com/syndtr/goleveldb/leveldb", "Rev": "63c9e642efad852f49e20a6f90194cae112fd2ac" diff --git a/Godeps/_workspace/src/github.com/calmh/luhn/LICENSE b/Godeps/_workspace/src/github.com/calmh/luhn/LICENSE new file mode 100644 index 000000000..0e07d0e10 --- /dev/null +++ b/Godeps/_workspace/src/github.com/calmh/luhn/LICENSE @@ -0,0 +1,19 @@ +Copyright (C) 2014 Jakob Borg + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +- The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/internal/luhn/luhn.go b/Godeps/_workspace/src/github.com/calmh/luhn/luhn.go similarity index 69% rename from internal/luhn/luhn.go rename to Godeps/_workspace/src/github.com/calmh/luhn/luhn.go index 7264835e2..8bcb0cd11 100644 --- a/internal/luhn/luhn.go +++ b/Godeps/_workspace/src/github.com/calmh/luhn/luhn.go @@ -1,17 +1,4 @@ -// Copyright (C) 2014 The Syncthing Authors. -// -// This program is free software: you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation, either version 3 of the License, or (at your option) -// any later version. -// -// This program is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -// more details. -// -// You should have received a copy of the GNU General Public License along -// with this program. If not, see . +// Copyright (C) 2014 Jakob Borg // Package luhn generates and validates Luhn mod N check digits. package luhn diff --git a/internal/luhn/luhn_test.go b/Godeps/_workspace/src/github.com/calmh/luhn/luhn_test.go similarity index 58% rename from internal/luhn/luhn_test.go rename to Godeps/_workspace/src/github.com/calmh/luhn/luhn_test.go index bdce8c5f1..eaef71c02 100644 --- a/internal/luhn/luhn_test.go +++ b/Godeps/_workspace/src/github.com/calmh/luhn/luhn_test.go @@ -1,24 +1,11 @@ -// Copyright (C) 2014 The Syncthing Authors. -// -// This program is free software: you can redistribute it and/or modify it -// under the terms of the GNU General Public License as published by the Free -// Software Foundation, either version 3 of the License, or (at your option) -// any later version. -// -// This program is distributed in the hope that it will be useful, but WITHOUT -// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -// more details. -// -// You should have received a copy of the GNU General Public License along -// with this program. If not, see . +// Copyright (C) 2014 Jakob Borg package luhn_test import ( "testing" - "github.com/syncthing/syncthing/internal/luhn" + "github.com/calmh/luhn" ) func TestGenerate(t *testing.T) { diff --git a/internal/protocol/.gitignore b/Godeps/_workspace/src/github.com/syncthing/protocol/.gitignore similarity index 100% rename from internal/protocol/.gitignore rename to Godeps/_workspace/src/github.com/syncthing/protocol/.gitignore diff --git a/Godeps/_workspace/src/github.com/syncthing/protocol/AUTHORS b/Godeps/_workspace/src/github.com/syncthing/protocol/AUTHORS new file mode 100644 index 000000000..f10d40d01 --- /dev/null +++ b/Godeps/_workspace/src/github.com/syncthing/protocol/AUTHORS @@ -0,0 +1,4 @@ +# This is the official list of authors for copyright purposes. + +Audrius Butkevicius +Jakob Borg diff --git a/Godeps/_workspace/src/github.com/syncthing/protocol/CONTRIBUTING.md b/Godeps/_workspace/src/github.com/syncthing/protocol/CONTRIBUTING.md new file mode 100644 index 000000000..856dde7d8 --- /dev/null +++ b/Godeps/_workspace/src/github.com/syncthing/protocol/CONTRIBUTING.md @@ -0,0 +1,76 @@ +## Reporting Bugs + +Please file bugs in the [Github Issue +Tracker](https://github.com/syncthing/protocol/issues). + +## Contributing Code + +Every contribution is welcome. Following the points below will make this +a smoother process. + +Individuals making significant and valuable contributions are given +commit-access to the project. If you make a significant contribution and +are not considered for commit-access, please contact any of the +Syncthing core team members. + +All nontrivial contributions should go through the pull request +mechanism for internal review. Determining what is "nontrivial" is left +at the discretion of the contributor. + +### Authorship + +All code authors are listed in the AUTHORS file. Commits must be made +with the same name and email as listed in the AUTHORS file. To +accomplish this, ensure that your git configuration is set correctly +prior to making your first commit; + + $ git config --global user.name "Jane Doe" + $ git config --global user.email janedoe@example.com + +You must be reachable on the given email address. If you do not wish to +use your real name for whatever reason, using a nickname or pseudonym is +perfectly acceptable. + +## Coding Style + +- Follow the conventions laid out in [Effective Go](https://golang.org/doc/effective_go.html) + as much as makes sense. + +- All text files use Unix line endings. + +- Each commit should be `go fmt` clean. + +- The commit message subject should be a single short sentence + describing the change, starting with a capital letter. + +- Commits that resolve an existing issue must include the issue number + as `(fixes #123)` at the end of the commit message subject. + +- Imports are grouped per `goimports` standard; that is, standard + library first, then third party libraries after a blank line. + +- A contribution solving a single issue or introducing a single new + feature should probably be a single commit based on the current + `master` branch. You may be asked to "rebase" or "squash" your pull + request to make sure this is the case, especially if there have been + amendments during review. + +## Licensing + +All contributions are made under the same GPL license as the rest of the +project, except documentation, user interface text and translation +strings which are licensed under the Creative Commons Attribution 4.0 +International License. You retain the copyright to code you have +written. + +When accepting your first contribution, the maintainer of the project +will ensure that you are added to the AUTHORS file. You are welcome to +add yourself as a separate commit in your first pull request. + +## Tests + +Yes please! + +## License + +GPLv3 diff --git a/Godeps/_workspace/src/github.com/syncthing/protocol/LICENSE b/Godeps/_workspace/src/github.com/syncthing/protocol/LICENSE new file mode 100644 index 000000000..94a9ed024 --- /dev/null +++ b/Godeps/_workspace/src/github.com/syncthing/protocol/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/Godeps/_workspace/src/github.com/syncthing/protocol/README.md b/Godeps/_workspace/src/github.com/syncthing/protocol/README.md new file mode 100644 index 000000000..f7dcf8dfb --- /dev/null +++ b/Godeps/_workspace/src/github.com/syncthing/protocol/README.md @@ -0,0 +1,13 @@ +The BEPv1 Protocol +================== + +[![Latest Build](http://img.shields.io/jenkins/s/http/build.syncthing.net/protocol.svg?style=flat-square)](http://build.syncthing.net/job/protocol/lastBuild/) +[![API Documentation](http://img.shields.io/badge/api-Godoc-blue.svg?style=flat-square)](http://godoc.org/github.com/syncthing/protocol) +[![GPL License](http://img.shields.io/badge/license-GPL-blue.svg?style=flat-square)](http://opensource.org/licenses/GPL-3.0) + +This is the protocol implementation used by Syncthing. + +License +======= + +GPLv3 diff --git a/internal/protocol/common_test.go b/Godeps/_workspace/src/github.com/syncthing/protocol/common_test.go similarity index 100% rename from internal/protocol/common_test.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/common_test.go diff --git a/internal/protocol/counting.go b/Godeps/_workspace/src/github.com/syncthing/protocol/counting.go similarity index 100% rename from internal/protocol/counting.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/counting.go diff --git a/internal/protocol/debug.go b/Godeps/_workspace/src/github.com/syncthing/protocol/debug.go similarity index 100% rename from internal/protocol/debug.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/debug.go diff --git a/internal/protocol/deviceid.go b/Godeps/_workspace/src/github.com/syncthing/protocol/deviceid.go similarity index 98% rename from internal/protocol/deviceid.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/deviceid.go index 93753d7fa..21b323255 100644 --- a/internal/protocol/deviceid.go +++ b/Godeps/_workspace/src/github.com/syncthing/protocol/deviceid.go @@ -24,7 +24,7 @@ import ( "regexp" "strings" - "github.com/syncthing/syncthing/internal/luhn" + "github.com/calmh/luhn" ) type DeviceID [32]byte diff --git a/internal/protocol/deviceid_test.go b/Godeps/_workspace/src/github.com/syncthing/protocol/deviceid_test.go similarity index 100% rename from internal/protocol/deviceid_test.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/deviceid_test.go diff --git a/internal/protocol/doc.go b/Godeps/_workspace/src/github.com/syncthing/protocol/doc.go similarity index 100% rename from internal/protocol/doc.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/doc.go diff --git a/internal/protocol/header.go b/Godeps/_workspace/src/github.com/syncthing/protocol/header.go similarity index 100% rename from internal/protocol/header.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/header.go diff --git a/internal/protocol/message.go b/Godeps/_workspace/src/github.com/syncthing/protocol/message.go similarity index 100% rename from internal/protocol/message.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/message.go diff --git a/internal/protocol/message_xdr.go b/Godeps/_workspace/src/github.com/syncthing/protocol/message_xdr.go similarity index 100% rename from internal/protocol/message_xdr.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/message_xdr.go diff --git a/internal/protocol/nativemodel_darwin.go b/Godeps/_workspace/src/github.com/syncthing/protocol/nativemodel_darwin.go similarity index 100% rename from internal/protocol/nativemodel_darwin.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/nativemodel_darwin.go diff --git a/internal/protocol/nativemodel_unix.go b/Godeps/_workspace/src/github.com/syncthing/protocol/nativemodel_unix.go similarity index 100% rename from internal/protocol/nativemodel_unix.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/nativemodel_unix.go diff --git a/internal/protocol/nativemodel_windows.go b/Godeps/_workspace/src/github.com/syncthing/protocol/nativemodel_windows.go similarity index 100% rename from internal/protocol/nativemodel_windows.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/nativemodel_windows.go diff --git a/internal/protocol/protocol.go b/Godeps/_workspace/src/github.com/syncthing/protocol/protocol.go similarity index 100% rename from internal/protocol/protocol.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/protocol.go diff --git a/internal/protocol/protocol_test.go b/Godeps/_workspace/src/github.com/syncthing/protocol/protocol_test.go similarity index 100% rename from internal/protocol/protocol_test.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/protocol_test.go diff --git a/internal/protocol/wireformat.go b/Godeps/_workspace/src/github.com/syncthing/protocol/wireformat.go similarity index 100% rename from internal/protocol/wireformat.go rename to Godeps/_workspace/src/github.com/syncthing/protocol/wireformat.go diff --git a/cmd/stfileinfo/main.go b/cmd/stfileinfo/main.go index 7e92d5bd5..5486433d6 100644 --- a/cmd/stfileinfo/main.go +++ b/cmd/stfileinfo/main.go @@ -21,7 +21,7 @@ import ( "os" "path/filepath" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/scanner" ) diff --git a/cmd/stfinddevice/main.go b/cmd/stfinddevice/main.go index b772327fb..bb27b014b 100644 --- a/cmd/stfinddevice/main.go +++ b/cmd/stfinddevice/main.go @@ -20,8 +20,8 @@ import ( "log" "os" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/discover" - "github.com/syncthing/syncthing/internal/protocol" ) func main() { diff --git a/cmd/stindex/main.go b/cmd/stindex/main.go index 75cb29ea2..6f44ca8cf 100644 --- a/cmd/stindex/main.go +++ b/cmd/stindex/main.go @@ -21,8 +21,8 @@ import ( "log" "os" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/db" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go index fd47c576c..fa2bb4b25 100644 --- a/cmd/syncthing/gui.go +++ b/cmd/syncthing/gui.go @@ -32,6 +32,7 @@ import ( "time" "github.com/calmh/logger" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/auto" "github.com/syncthing/syncthing/internal/config" "github.com/syncthing/syncthing/internal/db" @@ -39,7 +40,6 @@ import ( "github.com/syncthing/syncthing/internal/events" "github.com/syncthing/syncthing/internal/model" "github.com/syncthing/syncthing/internal/osutil" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syncthing/syncthing/internal/upgrade" "github.com/vitrun/qart/qr" "golang.org/x/crypto/bcrypt" diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 2288b07db..ca6ba93f1 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -37,13 +37,13 @@ import ( "github.com/calmh/logger" "github.com/juju/ratelimit" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" "github.com/syncthing/syncthing/internal/db" "github.com/syncthing/syncthing/internal/discover" "github.com/syncthing/syncthing/internal/events" "github.com/syncthing/syncthing/internal/model" "github.com/syncthing/syncthing/internal/osutil" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syncthing/syncthing/internal/symlinks" "github.com/syncthing/syncthing/internal/upgrade" "github.com/syncthing/syncthing/internal/upnp" diff --git a/cmd/syncthing/main_test.go b/cmd/syncthing/main_test.go index 102089448..5630673bb 100644 --- a/cmd/syncthing/main_test.go +++ b/cmd/syncthing/main_test.go @@ -19,10 +19,10 @@ import ( "os" "testing" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" "github.com/syncthing/syncthing/internal/db" "github.com/syncthing/syncthing/internal/model" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" diff --git a/cmd/syncthing/perfstats_unix.go b/cmd/syncthing/perfstats_unix.go index 12c135b2d..1aa271f22 100644 --- a/cmd/syncthing/perfstats_unix.go +++ b/cmd/syncthing/perfstats_unix.go @@ -24,7 +24,7 @@ import ( "syscall" "time" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) func init() { diff --git a/internal/config/config.go b/internal/config/config.go index 38987355f..52d890876 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -28,8 +28,8 @@ import ( "strconv" "github.com/calmh/logger" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/osutil" - "github.com/syncthing/syncthing/internal/protocol" "golang.org/x/crypto/bcrypt" ) diff --git a/internal/config/config_test.go b/internal/config/config_test.go index e20946417..05773962c 100644 --- a/internal/config/config_test.go +++ b/internal/config/config_test.go @@ -21,7 +21,7 @@ import ( "reflect" "testing" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) var device1, device2, device3, device4 protocol.DeviceID diff --git a/internal/config/wrapper.go b/internal/config/wrapper.go index f21d0b568..fe06fd4ee 100644 --- a/internal/config/wrapper.go +++ b/internal/config/wrapper.go @@ -21,9 +21,9 @@ import ( "path/filepath" "sync" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/events" "github.com/syncthing/syncthing/internal/osutil" - "github.com/syncthing/syncthing/internal/protocol" ) // An interface to handle configuration changes, and a wrapper type รก la diff --git a/internal/db/blockmap.go b/internal/db/blockmap.go index 93355093f..5f2217399 100644 --- a/internal/db/blockmap.go +++ b/internal/db/blockmap.go @@ -28,9 +28,9 @@ import ( "sort" "sync" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" "github.com/syncthing/syncthing/internal/osutil" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/util" diff --git a/internal/db/blockmap_test.go b/internal/db/blockmap_test.go index 9e9fdadf9..b8c4bc173 100644 --- a/internal/db/blockmap_test.go +++ b/internal/db/blockmap_test.go @@ -18,8 +18,8 @@ package db import ( "testing" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" diff --git a/internal/db/leveldb.go b/internal/db/leveldb.go index da6ba53a7..ff81f594c 100644 --- a/internal/db/leveldb.go +++ b/internal/db/leveldb.go @@ -25,8 +25,8 @@ import ( "sort" "sync" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/lamport" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/iterator" "github.com/syndtr/goleveldb/leveldb/opt" diff --git a/internal/db/set.go b/internal/db/set.go index 6791997be..0ddc38554 100644 --- a/internal/db/set.go +++ b/internal/db/set.go @@ -24,9 +24,9 @@ package db import ( "sync" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/lamport" "github.com/syncthing/syncthing/internal/osutil" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/internal/db/set_test.go b/internal/db/set_test.go index 953f28072..8c1b5bc72 100644 --- a/internal/db/set_test.go +++ b/internal/db/set_test.go @@ -22,9 +22,9 @@ import ( "sort" "testing" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/db" "github.com/syncthing/syncthing/internal/lamport" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" ) diff --git a/internal/db/truncated.go b/internal/db/truncated.go index c3cbc1d8c..ab8668394 100644 --- a/internal/db/truncated.go +++ b/internal/db/truncated.go @@ -21,7 +21,7 @@ package db import ( "fmt" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) // Used for unmarshalling a FileInfo structure but skipping the block list. diff --git a/internal/discover/client.go b/internal/discover/client.go index a506395f1..84e64f943 100644 --- a/internal/discover/client.go +++ b/internal/discover/client.go @@ -20,7 +20,7 @@ import ( "net/url" "time" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) type Factory func(*url.URL, *Announce) (Client, error) diff --git a/internal/discover/client_test.go b/internal/discover/client_test.go index f57085c31..f11f0f2ac 100644 --- a/internal/discover/client_test.go +++ b/internal/discover/client_test.go @@ -23,7 +23,7 @@ import ( "testing" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) var device protocol.DeviceID diff --git a/internal/discover/client_udp.go b/internal/discover/client_udp.go index da72d8b22..2381ae23a 100644 --- a/internal/discover/client_udp.go +++ b/internal/discover/client_udp.go @@ -24,7 +24,7 @@ import ( "sync" "time" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) func init() { diff --git a/internal/discover/discover.go b/internal/discover/discover.go index c75a3331d..beae97029 100644 --- a/internal/discover/discover.go +++ b/internal/discover/discover.go @@ -25,9 +25,9 @@ import ( "sync" "time" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/beacon" "github.com/syncthing/syncthing/internal/events" - "github.com/syncthing/syncthing/internal/protocol" ) type Discoverer struct { diff --git a/internal/discover/discover_test.go b/internal/discover/discover_test.go index fce201fba..d138c8af4 100644 --- a/internal/discover/discover_test.go +++ b/internal/discover/discover_test.go @@ -21,7 +21,7 @@ import ( "testing" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) type DummyClient struct { diff --git a/internal/model/deviceactivity.go b/internal/model/deviceactivity.go index 2c8fd5ad1..7c1d42ef1 100644 --- a/internal/model/deviceactivity.go +++ b/internal/model/deviceactivity.go @@ -18,7 +18,7 @@ package model import ( "sync" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) // deviceActivity tracks the number of outstanding requests per device and can diff --git a/internal/model/deviceactivity_test.go b/internal/model/deviceactivity_test.go index a4f672d1c..df45048ba 100644 --- a/internal/model/deviceactivity_test.go +++ b/internal/model/deviceactivity_test.go @@ -18,7 +18,7 @@ package model import ( "testing" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) func TestDeviceActivity(t *testing.T) { diff --git a/internal/model/model.go b/internal/model/model.go index 6de6bb98f..c13425c55 100644 --- a/internal/model/model.go +++ b/internal/model/model.go @@ -30,13 +30,13 @@ import ( "sync" "time" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" "github.com/syncthing/syncthing/internal/db" "github.com/syncthing/syncthing/internal/events" "github.com/syncthing/syncthing/internal/ignore" "github.com/syncthing/syncthing/internal/lamport" "github.com/syncthing/syncthing/internal/osutil" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syncthing/syncthing/internal/scanner" "github.com/syncthing/syncthing/internal/stats" "github.com/syncthing/syncthing/internal/symlinks" diff --git a/internal/model/model_test.go b/internal/model/model_test.go index 68b328bd8..1e17fd23a 100644 --- a/internal/model/model_test.go +++ b/internal/model/model_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syndtr/goleveldb/leveldb" "github.com/syndtr/goleveldb/leveldb/storage" ) diff --git a/internal/model/puller.go b/internal/model/puller.go index 197f7ec31..fc736d67c 100644 --- a/internal/model/puller.go +++ b/internal/model/puller.go @@ -27,12 +27,12 @@ import ( "github.com/AudriusButkevicius/lfu-go" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" "github.com/syncthing/syncthing/internal/db" "github.com/syncthing/syncthing/internal/events" "github.com/syncthing/syncthing/internal/ignore" "github.com/syncthing/syncthing/internal/osutil" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syncthing/syncthing/internal/scanner" "github.com/syncthing/syncthing/internal/symlinks" "github.com/syncthing/syncthing/internal/versioner" diff --git a/internal/model/puller_test.go b/internal/model/puller_test.go index 811ac9238..8ab426d29 100644 --- a/internal/model/puller_test.go +++ b/internal/model/puller_test.go @@ -21,8 +21,8 @@ import ( "testing" "time" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syncthing/syncthing/internal/scanner" "github.com/syndtr/goleveldb/leveldb" diff --git a/internal/model/sharedpullerstate.go b/internal/model/sharedpullerstate.go index 136f7a697..9dbd801fd 100644 --- a/internal/model/sharedpullerstate.go +++ b/internal/model/sharedpullerstate.go @@ -21,8 +21,8 @@ import ( "path/filepath" "sync" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/db" - "github.com/syncthing/syncthing/internal/protocol" ) // A sharedPullerState is kept for each file that is being synced and is kept diff --git a/internal/scanner/blockqueue.go b/internal/scanner/blockqueue.go index 2d1a8656a..6091b4239 100644 --- a/internal/scanner/blockqueue.go +++ b/internal/scanner/blockqueue.go @@ -20,7 +20,7 @@ import ( "path/filepath" "sync" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) // The parallell hasher reads FileInfo structures from the inbox, hashes the diff --git a/internal/scanner/blocks.go b/internal/scanner/blocks.go index 8ec2c26b4..96994a43e 100644 --- a/internal/scanner/blocks.go +++ b/internal/scanner/blocks.go @@ -21,7 +21,7 @@ import ( "fmt" "io" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) var SHA256OfNothing = []uint8{0xe3, 0xb0, 0xc4, 0x42, 0x98, 0xfc, 0x1c, 0x14, 0x9a, 0xfb, 0xf4, 0xc8, 0x99, 0x6f, 0xb9, 0x24, 0x27, 0xae, 0x41, 0xe4, 0x64, 0x9b, 0x93, 0x4c, 0xa4, 0x95, 0x99, 0x1b, 0x78, 0x52, 0xb8, 0x55} diff --git a/internal/scanner/blocks_test.go b/internal/scanner/blocks_test.go index 728e46c2b..19a1a0f00 100644 --- a/internal/scanner/blocks_test.go +++ b/internal/scanner/blocks_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" ) var blocksTestData = []struct { diff --git a/internal/scanner/walk.go b/internal/scanner/walk.go index 624228883..06906e630 100644 --- a/internal/scanner/walk.go +++ b/internal/scanner/walk.go @@ -23,9 +23,9 @@ import ( "strings" "time" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/ignore" "github.com/syncthing/syncthing/internal/lamport" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syncthing/syncthing/internal/symlinks" "golang.org/x/text/unicode/norm" ) diff --git a/internal/scanner/walk_test.go b/internal/scanner/walk_test.go index f01d3232c..2d46dc0ed 100644 --- a/internal/scanner/walk_test.go +++ b/internal/scanner/walk_test.go @@ -24,8 +24,8 @@ import ( "sort" "testing" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/ignore" - "github.com/syncthing/syncthing/internal/protocol" ) type testfile struct { diff --git a/internal/stats/device.go b/internal/stats/device.go index 408468283..faccd9efb 100644 --- a/internal/stats/device.go +++ b/internal/stats/device.go @@ -18,7 +18,7 @@ package stats import ( "time" - "github.com/syncthing/syncthing/internal/protocol" + "github.com/syncthing/protocol" "github.com/syndtr/goleveldb/leveldb" ) diff --git a/internal/symlinks/symlink_unix.go b/internal/symlinks/symlink_unix.go index 4dd73cb12..c1c05c27d 100644 --- a/internal/symlinks/symlink_unix.go +++ b/internal/symlinks/symlink_unix.go @@ -20,8 +20,8 @@ package symlinks import ( "os" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/osutil" - "github.com/syncthing/syncthing/internal/protocol" ) var ( diff --git a/internal/symlinks/symlink_windows.go b/internal/symlinks/symlink_windows.go index 0aeb6b837..ba5b1f09a 100644 --- a/internal/symlinks/symlink_windows.go +++ b/internal/symlinks/symlink_windows.go @@ -21,8 +21,8 @@ import ( "os" "path/filepath" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/osutil" - "github.com/syncthing/syncthing/internal/protocol" "syscall" "unicode/utf16" diff --git a/test/filetype_test.go b/test/filetype_test.go index 522bee984..bdcb173ff 100644 --- a/test/filetype_test.go +++ b/test/filetype_test.go @@ -23,8 +23,8 @@ import ( "testing" "time" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" - "github.com/syncthing/syncthing/internal/protocol" ) func TestFileTypeChange(t *testing.T) { diff --git a/test/manypeers_test.go b/test/manypeers_test.go index 55c83fc7e..715051f51 100644 --- a/test/manypeers_test.go +++ b/test/manypeers_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" "github.com/syncthing/syncthing/internal/osutil" - "github.com/syncthing/syncthing/internal/protocol" ) func TestManyPeers(t *testing.T) { diff --git a/test/symlink_test.go b/test/symlink_test.go index f5da40659..6b90ba971 100644 --- a/test/symlink_test.go +++ b/test/symlink_test.go @@ -25,8 +25,8 @@ import ( "testing" "time" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" - "github.com/syncthing/syncthing/internal/protocol" "github.com/syncthing/syncthing/internal/symlinks" ) diff --git a/test/sync_test.go b/test/sync_test.go index 9f04e7c41..941df00b1 100644 --- a/test/sync_test.go +++ b/test/sync_test.go @@ -24,8 +24,8 @@ import ( "testing" "time" + "github.com/syncthing/protocol" "github.com/syncthing/syncthing/internal/config" - "github.com/syncthing/syncthing/internal/protocol" ) func TestSyncClusterWithoutVersioning(t *testing.T) {