Skip to content

Commit

Permalink
license update
Browse files Browse the repository at this point in the history
  • Loading branch information
mmatczuk committed Sep 27, 2017
1 parent 1fadd01 commit 262f210
Show file tree
Hide file tree
Showing 40 changed files with 181 additions and 10 deletions.
33 changes: 24 additions & 9 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -1,12 +1,27 @@
Copyright (c) 2016, Michał Jan Matczuk
All rights reserved.
Copyright (c) 2017 Michał Matczuk. All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following disclaimer
in the documentation and/or other materials provided with the
distribution.
* Neither the name of Google Inc. nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,8 @@ See:

## License

The BSD 3-Clause License
Copyright (C) 2017 Michał Matczuk

This project is distributed under the BSD-3 license. See the [LICENSE](https://github.com/mmatczuk/go-http-tunnel/blob/master/LICENSE) file for details.

GitHub star is always appreciated!
4 changes: 4 additions & 0 deletions auth.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import "strings"
Expand Down
4 changes: 4 additions & 0 deletions auth_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import (
Expand Down
4 changes: 4 additions & 0 deletions backoff.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import "time"
Expand Down
4 changes: 4 additions & 0 deletions client.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import (
Expand Down
4 changes: 4 additions & 0 deletions client_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import (
Expand Down
4 changes: 4 additions & 0 deletions cmd/cmd/log.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package cmd

import (
Expand Down
4 changes: 4 additions & 0 deletions cmd/tunnel/config.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

import (
Expand Down
4 changes: 4 additions & 0 deletions cmd/tunnel/normalize.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

import (
Expand Down
4 changes: 4 additions & 0 deletions cmd/tunnel/normalize_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

import (
Expand Down
4 changes: 4 additions & 0 deletions cmd/tunnel/options.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

import (
Expand Down
4 changes: 4 additions & 0 deletions cmd/tunnel/tunnel.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

import (
Expand Down
4 changes: 4 additions & 0 deletions cmd/tunnel/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

var version = "snapshot"
4 changes: 4 additions & 0 deletions cmd/tunneld/options.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

import (
Expand Down
4 changes: 4 additions & 0 deletions cmd/tunneld/tunneld.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

import (
Expand Down
4 changes: 4 additions & 0 deletions cmd/tunneld/version.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package main

var version = "snapshot"
4 changes: 4 additions & 0 deletions doc.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// Package tunnel is fast and secure client/server package that enables proxying
// public connections to your local machine over a tunnel connection from the
// local machine to the public server.
Expand Down
4 changes: 4 additions & 0 deletions errors.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import "errors"
Expand Down
4 changes: 4 additions & 0 deletions httpproxy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import (
Expand Down
4 changes: 4 additions & 0 deletions id/id.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package id

import (
Expand Down
4 changes: 4 additions & 0 deletions id/ptls.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package id

import (
Expand Down
4 changes: 4 additions & 0 deletions integration_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel_test

import (
Expand Down
4 changes: 4 additions & 0 deletions log/filterlogger.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package log

type filterLogger struct {
Expand Down
4 changes: 4 additions & 0 deletions log/filterlogger_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package log

import (
Expand Down
4 changes: 4 additions & 0 deletions log/log.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package log

// Logger is the fundamental interface for all log operations. Log creates a
Expand Down
4 changes: 4 additions & 0 deletions log/log_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package log

import (
Expand Down
4 changes: 4 additions & 0 deletions log/noplogger.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package log

type nopLogger struct{}
Expand Down
4 changes: 4 additions & 0 deletions log/stdlogger.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package log

import (
Expand Down
4 changes: 4 additions & 0 deletions mock/backoff.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// Automatically generated by MockGen. DO NOT EDIT!
// Source: github.com/mmatczuk/go-http-tunnel (interfaces: Backoff)

Expand Down
4 changes: 4 additions & 0 deletions mock/logger.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

// Automatically generated by MockGen. DO NOT EDIT!
// Source: github.com/mmatczuk/go-http-tunnel/log (interfaces: Logger)

Expand Down
4 changes: 4 additions & 0 deletions pool.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import (
Expand Down
4 changes: 4 additions & 0 deletions proto/controlmsg.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package proto

import (
Expand Down
4 changes: 4 additions & 0 deletions proto/controlmsg_test.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package proto

import (
Expand Down
4 changes: 4 additions & 0 deletions proto/tunnel.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package proto

// Tunnel describes a single tunnel between client and server. When connecting
Expand Down
4 changes: 4 additions & 0 deletions proxy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import (
Expand Down
4 changes: 4 additions & 0 deletions registry.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import (
Expand Down
4 changes: 4 additions & 0 deletions server.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import (
Expand Down
4 changes: 4 additions & 0 deletions tcpproxy.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import (
Expand Down
4 changes: 4 additions & 0 deletions utils.go
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
// Copyright (C) 2017 Michał Matczuk
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.

package tunnel

import (
Expand Down

0 comments on commit 262f210

Please sign in to comment.