Raise copyright year. Trivial changes

diff --git a/INSTALL b/INSTALL
index b73f97039531e5f79003271ed0cfb49f98fdfaa8..7ec5896bbd7041c759634ddc3c92e59d2a5921a5 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,12 +1,7 @@
 goircd requires only standard Go's libraries and consists of single main
 goircd requires only standard Go's libraries and consists of single main

-package. You can install it using either:
+package. You can install it like that:

 
 

-       % go get github.com/stargrave/goircd
-       % go install github.com/stargrave/goircd
+    % git clone https://github.com/stargrave/goircd.git
+    % gmake -C goircd

 
 

-or if you are already inside goircd directory:
-
-       % go install
-
-You should found goircd executable binary in your $GOPATH/bin/goircd.

 Just run it with -help argument to see available options.
 Just run it with -help argument to see available options.

diff --git a/Makefile b/Makefile
deleted file mode 100644 (file)
index 3a8e1ff..0000000
--- a/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-LDFLAGS="-X main.version \"$(shell git describe --tags)\""
-
-goircd:
-       go install -ldflags $(LDFLAGS) $(BUILD_FLAGS)

diff --git a/README b/README
index 9b4d8cf1d8d193e947824f68abf88d52e6be3b49..87824263e449cc109f01eb4058f9839437942d8d 100644 (file)
--- a/README
+++ b/README
@@ -1,10 +1,6 @@
      goircd -- minimalistic simple Internet Relay Chat (IRC) server
      ==============================================================
 
      goircd -- minimalistic simple Internet Relay Chat (IRC) server
      ==============================================================
 

-SYNOPSIS
-
-goircd is very simple IRC server, written on Go.
-

 DESCRIPTION
 
 goircd is very simple IRC server, written on Go.
 DESCRIPTION
 
 goircd is very simple IRC server, written on Go.


@@ -14,7 +10,6 @@ It does not aim to replace full featured mass scalable IRC networks:
 * It can not connect to other servers. Just standalone installation
 * It has few basic IRC commands
 * There is no support for channel operators, modes, votes, invites
 * It can not connect to other servers. Just standalone installation
 * It has few basic IRC commands
 * There is no support for channel operators, modes, votes, invites

-  and so on

 * No ident lookups, reverse DNS queries
 
 But it has some convincing features:
 * No ident lookups, reverse DNS queries
 
 But it has some convincing features:


@@ -28,7 +23,7 @@ But it has some convincing features:
 * Optional permanent channel's state saving in plain text files
   (so you can reload daemon and all channels topics and keys won't
   disappear)
 * Optional permanent channel's state saving in plain text files
   (so you can reload daemon and all channels topics and keys won't
   disappear)

-* Optional ability to authenticate users by nickname↔password
+* Optional ability to authenticate users by nickname and password

 
 Some remarks and recommendations related to it's simplicity:
 
 
 Some remarks and recommendations related to it's simplicity:
 

diff --git a/client.go b/client.go
index 1b4a9c365993abc7aa2b0f537bd98b498fe87947..95dd93f60d9e7958d5eeec9229284cb96ab403cb 100644 (file)
--- a/client.go
+++ b/client.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server

-Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>

 
 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
 
 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


@@ -15,6 +15,7 @@ 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 <http://www.gnu.org/licenses/>.
 */
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+

 package main
 
 import (
 package main
 
 import (

diff --git a/client_test.go b/client_test.go
index 5369bbeff4888a40590fdced2f49ae31ccfc2289..38f88081dc8f4f73d0b352e77705a983c3fb3e5c 100644 (file)
--- a/client_test.go
+++ b/client_test.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server

-Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>

 
 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
 
 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


@@ -15,6 +15,7 @@ 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 <http://www.gnu.org/licenses/>.
 */
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+

 package main
 
 import (
 package main
 
 import (

diff --git a/daemon.go b/daemon.go
index ed708de9875a7b054f27e5a27bfad6e122ad90d3..6b44039651032b54ef0e769416581b563983a3f9 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server

-Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>

 
 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
 
 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


@@ -15,6 +15,7 @@ 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 <http://www.gnu.org/licenses/>.
 */
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+

 package main
 
 import (
 package main
 
 import (


@@ -29,9 +30,12 @@ import (
 )
 
 const (
 )
 
 const (

-       PingTimeout    = time.Second * 180 // Max time deadline for client's unresponsiveness
-       PingThreshold  = time.Second * 90  // Max idle client's time before PING are sent
-       AlivenessCheck = time.Second * 10  // Client's aliveness check period
+       // Max time deadline for client's unresponsiveness
+       PingTimeout = time.Second * 180
+       // Max idle client's time before PING are sent
+       PingThreshold = time.Second * 90
+       // Client's aliveness check period
+       AlivenessCheck = time.Second * 10

 )
 
 var (
 )
 
 var (


@@ -54,7 +58,12 @@ type Daemon struct {
 }
 
 func NewDaemon(version string, hostname, motd, passwords *string, logSink chan<- LogEvent, stateSink chan<- StateEvent) *Daemon {
 }
 
 func NewDaemon(version string, hostname, motd, passwords *string, logSink chan<- LogEvent, stateSink chan<- StateEvent) *Daemon {

-       daemon := Daemon{version: version, hostname: hostname, motd: motd, passwords: passwords}
+       daemon := Daemon{
+               version: version,
+               hostname: hostname,
+               motd: motd,
+               passwords: passwords,
+       }

        daemon.clients = make(map[*Client]bool)
        daemon.clientAliveness = make(map[*Client]*ClientAlivenessState)
        daemon.rooms = make(map[string]*Room)
        daemon.clients = make(map[*Client]bool)
        daemon.clientAliveness = make(map[*Client]*ClientAlivenessState)
        daemon.rooms = make(map[string]*Room)


@@ -324,7 +333,10 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                switch event.eventType {
                case EventNew:
                        daemon.clients[client] = true
                switch event.eventType {
                case EventNew:
                        daemon.clients[client] = true

-                       daemon.clientAliveness[client] = &ClientAlivenessState{pingSent: false, timestamp: now}
+                       daemon.clientAliveness[client] = &ClientAlivenessState{
+                               pingSent: false,
+                               timestamp: now,
+                       }

                case EventDel:
                        delete(daemon.clients, client)
                        delete(daemon.clientAliveness, client)
                case EventDel:
                        delete(daemon.clients, client)
                        delete(daemon.clientAliveness, client)


@@ -445,7 +457,11 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                if !found {
                                        client.ReplyNoNickChan(target)
                                }
                                if !found {
                                        client.ReplyNoNickChan(target)
                                }

-                               daemon.roomSinks[r] <- ClientEvent{client, EventMsg, command + " " + strings.TrimLeft(cols[1], ":")}
+                               daemon.roomSinks[r] <- ClientEvent{
+                                       client,
+                                       EventMsg,
+                                       command + " " + strings.TrimLeft(cols[1], ":"),
+                               }

                        case "TOPIC":
                                if len(cols) == 1 {
                                        client.ReplyNotEnoughParameters("TOPIC")
                        case "TOPIC":
                                if len(cols) == 1 {
                                        client.ReplyNotEnoughParameters("TOPIC")

diff --git a/daemon_test.go b/daemon_test.go
index ac9bc4cfc3ec5c8ac351db2fe961134b6c98fc31..3db72cb6b73fee9d3636d6a9a30133ee8e8d5ac9 100644 (file)
--- a/daemon_test.go
+++ b/daemon_test.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server

-Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>

 
 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
 
 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


@@ -15,6 +15,7 @@ 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 <http://www.gnu.org/licenses/>.
 */
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+

 package main
 
 import (
 package main
 
 import (

diff --git a/events.go b/events.go
index 30444dad06d0d18aeacc07bd7551fcb390c8756e..843e8b59d8b407d2e96de3e334d77afab4219d80 100644 (file)
--- a/events.go
+++ b/events.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server

-Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>

 
 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
 
 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


@@ -15,6 +15,7 @@ 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 <http://www.gnu.org/licenses/>.
 */
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+

 package main
 
 import (
 package main
 
 import (

diff --git a/goircd.go b/goircd.go
index 13efe2c9c5cca7dc790e522cb7bb17032b493bd6..94861531d6758864fb2b64a8c2121b2e852167a7 100644 (file)
--- a/goircd.go
+++ b/goircd.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server

-Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>

 
 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
 
 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


@@ -15,6 +15,7 @@ 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 <http://www.gnu.org/licenses/>.
 */
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+

 package main
 
 import (
 package main
 
 import (

diff --git a/makefile b/makefile
new file mode 100644 (file)
index 0000000..26e28a7
--- /dev/null
+++ b/makefile
@@ -0,0 +1,4 @@
+LDFLAGS=-X main.version \"$(shell git describe --tags)\"
+
+goircd:
+       go build -ldflags "$(LDFLAGS)" $(BUILD_FLAGS)

diff --git a/room.go b/room.go
index ff572316134806fdf3474d046bb152ec7a322147..99ec208e573ff97be207abeb8fd6f475807a8ec6 100644 (file)
--- a/room.go
+++ b/room.go
@@ -1,6 +1,6 @@
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server
 /*
 goircd -- minimalistic simple Internet Relay Chat (IRC) server

-Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>

 
 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
 
 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


@@ -15,6 +15,7 @@ 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 <http://www.gnu.org/licenses/>.
 */
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

+

 package main
 
 import (
 package main
 
 import (