Add missing license headers and make them consistent

20 files changed, 177 insertions, 35 deletions

diff --git a/README b/README
index 0490e1f..3d761e8 100644
--- a/README
+++ b/README
@@ -23,6 +23,15 @@ no modification, using Apple's native usbmuxd. This is useful if you need to
 tunnel to your phone from another OS in a pinch. Run python tcpclient.py --help
 for usage information.
 
+License
+=======
+
+The contents of this package are licensed under the GNU General Public License,
+versions 2 or 3 (see COPYING.GPLv2 and COPYING.GPLv3), except for Libuxbmuxd
+which is licensed under the GNU Lesser General Public License, version 2.1 or,
+at your option, any later version (see COPYING.LGPLv2.1). If a more permissive
+license is specified at the top of a source file, it takes precedence over this.
+
 Building
 ========
 
diff --git a/common/utils.c b/common/utils.c
index f66d889..5f5e23b 100644
--- a/common/utils.c
+++ b/common/utils.c
@@ -2,6 +2,7 @@
         usbmuxd - iPhone/iPod Touch USB multiplex server daemon
 
 Copyright (C) 2009      Hector Martin "marcan" <hector@marcansoft.com>
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
 
 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
@@ -14,7 +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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
diff --git a/common/utils.h b/common/utils.h
index f9cfa93..95d3b44 100644
--- a/common/utils.h
+++ b/common/utils.h
@@ -2,6 +2,7 @@
         usbmuxd - iPhone/iPod Touch USB multiplex server daemon
 
 Copyright (C) 2009      Hector Martin "marcan" <hector@marcansoft.com>
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
 
 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
@@ -14,7 +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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
diff --git a/daemon/client.c b/daemon/client.c
index 37f5ed6..5498586 100644
--- a/daemon/client.c
+++ b/daemon/client.c
@@ -2,6 +2,7 @@
         usbmuxd - iPhone/iPod Touch USB multiplex server daemon
 
 Copyright (C) 2009      Hector Martin "marcan" <hector@marcansoft.com>
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
 
 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
@@ -14,7 +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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
diff --git a/daemon/client.h b/daemon/client.h
index 4fc1ab4..444fe15 100644
--- a/daemon/client.h
+++ b/daemon/client.h
@@ -2,6 +2,7 @@
         usbmuxd - iPhone/iPod Touch USB multiplex server daemon
 
 Copyright (C) 2009      Hector Martin "marcan" <hector@marcansoft.com>
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
 
 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
@@ -14,7 +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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
diff --git a/daemon/device.c b/daemon/device.c
index 37c09a6..00c0340 100644
--- a/daemon/device.c
+++ b/daemon/device.c
@@ -14,7 +14,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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
diff --git a/daemon/device.h b/daemon/device.h
index ce6c50b..4bf9752 100644
--- a/daemon/device.h
+++ b/daemon/device.h
@@ -14,7 +14,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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
diff --git a/daemon/log.c b/daemon/log.c
index 2392b0d..1973257 100644
--- a/daemon/log.c
+++ b/daemon/log.c
@@ -2,6 +2,7 @@
         usbmuxd - iPhone/iPod Touch USB multiplex server daemon
 
 Copyright (C) 2009      Hector Martin "marcan" <hector@marcansoft.com>
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
 
 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
@@ -14,7 +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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
diff --git a/daemon/log.h b/daemon/log.h
index 4a2ac2e..eeefa41 100644
--- a/daemon/log.h
+++ b/daemon/log.h
@@ -2,6 +2,7 @@
         usbmuxd - iPhone/iPod Touch USB multiplex server daemon
 
 Copyright (C) 2009      Hector Martin "marcan" <hector@marcansoft.com>
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
 
 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
@@ -14,7 +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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
diff --git a/daemon/main.c b/daemon/main.c
index 5fa5422..7c38166 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -2,6 +2,8 @@
         usbmuxd - iPhone/iPod Touch USB multiplex server daemon
 
 Copyright (C) 2009      Hector Martin "marcan" <hector@marcansoft.com>
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
+Copyright (C) 2009      Paul Sladen <libiphone@paul.sladen.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
@@ -14,7 +16,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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
diff --git a/daemon/usb-linux.c b/daemon/usb-linux.c
index 1f70f46..4a5711d 100644
--- a/daemon/usb-linux.c
+++ b/daemon/usb-linux.c
@@ -2,6 +2,8 @@
         usbmuxd - iPhone/iPod Touch USB multiplex server daemon
 
 Copyright (C) 2009      Hector Martin "marcan" <hector@marcansoft.com>
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
+Copyright (C) 2009      Martin Szulecki <opensuse@sukimashita.com>
 
 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
@@ -14,7 +16,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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
diff --git a/daemon/usb.h b/daemon/usb.h
index 9b2cb1a..c557e45 100644
--- a/daemon/usb.h
+++ b/daemon/usb.h
@@ -2,6 +2,8 @@
         usbmuxd - iPhone/iPod Touch USB multiplex server daemon
 
 Copyright (C) 2009      Hector Martin "marcan" <hector@marcansoft.com>
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
+Copyright (C) 2009      Martin Szulecki <opensuse@sukimashita.com>
 
 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
@@ -14,7 +16,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, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
diff --git a/libusbmuxd/libusbmuxd.c b/libusbmuxd/libusbmuxd.c
index 6970816..d375dd6 100644
--- a/libusbmuxd/libusbmuxd.c
+++ b/libusbmuxd/libusbmuxd.c
@@ -1,3 +1,26 @@
+/*
+        libusbmuxd - client library to talk to usbmuxd
+
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
+Copyright (C) 2009      Paul Sladen <libiphone@paul.sladen.org>
+Copyright (C) 2009      Martin Szulecki <opensuse@sukimashita.com>
+
+This library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation, either version 2.1 of the
+License, or (at your option) any later version.
+
+This library 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 Lesser General Public
+License along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
 #include <stdint.h>
 #include <stdlib.h>
 #include <errno.h>
diff --git a/libusbmuxd/sock_stuff.c b/libusbmuxd/sock_stuff.c
index 2c68659..9b0266e 100644
--- a/libusbmuxd/sock_stuff.c
+++ b/libusbmuxd/sock_stuff.c
@@ -1,3 +1,26 @@
+/*
+        libusbmuxd - client library to talk to usbmuxd
+
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
+Copyright (C) 2009      Paul Sladen <libiphone@paul.sladen.org>
+Copyright (C) 2009      Martin Szulecki <opensuse@sukimashita.com>
+
+This library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation, either version 2.1 of the
+License, or (at your option) any later version.
+
+This library 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 Lesser General Public
+License along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
 #include <stdio.h>
 #include <stddef.h>
 #include <stdlib.h>
diff --git a/libusbmuxd/sock_stuff.h b/libusbmuxd/sock_stuff.h
index 190f7e1..282da68 100644
--- a/libusbmuxd/sock_stuff.h
+++ b/libusbmuxd/sock_stuff.h
@@ -1,3 +1,26 @@
+/*
+        libusbmuxd - client library to talk to usbmuxd
+
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
+Copyright (C) 2009      Paul Sladen <libiphone@paul.sladen.org>
+Copyright (C) 2009      Martin Szulecki <opensuse@sukimashita.com>
+
+This library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation, either version 2.1 of the
+License, or (at your option) any later version.
+
+This library 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 Lesser General Public
+License along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
 #ifndef __SOCK_STUFF_H
 #define __SOCK_STUFF_H
 
diff --git a/libusbmuxd/usbmuxd-proto.h b/libusbmuxd/usbmuxd-proto.h
index 1ecb7bc..9d841ca 100644
--- a/libusbmuxd/usbmuxd-proto.h
+++ b/libusbmuxd/usbmuxd-proto.h
@@ -1,3 +1,26 @@
+/*
+        libusbmuxd - client library to talk to usbmuxd
+
+Copyright (C) 2009      Paul Sladen <libiphone@paul.sladen.org>
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
+Copyright (C) 2009      Hector Martin "marcan" <hector@marcansoft.com>
+
+This library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation, either version 2.1 of the
+License, or (at your option) any later version.
+
+This library 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 Lesser General Public
+License along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
 /* Protocol defintion for usbmuxd proxy protocol */
 #ifndef __USBMUXD_PROTO_H
 #define __USBMUXD_PROTO_H
diff --git a/libusbmuxd/usbmuxd.h b/libusbmuxd/usbmuxd.h
index f3b57b3..1bbf478 100644
--- a/libusbmuxd/usbmuxd.h
+++ b/libusbmuxd/usbmuxd.h
@@ -1,3 +1,26 @@
+/*
+        libusbmuxd - client library to talk to usbmuxd
+
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
+Copyright (C) 2009      Paul Sladen <libiphone@paul.sladen.org>
+Copyright (C) 2009      Martin Szulecki <opensuse@sukimashita.com>
+
+This library is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as
+published by the Free Software Foundation, either version 2.1 of the
+License, or (at your option) any later version.
+
+This library 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 Lesser General Public
+License along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+
 #ifndef __USBMUXD_H
 #define __USBMUXD_H
 #include <stdint.h>
diff --git a/python-client/tcprelay.py b/python-client/tcprelay.py
index 2874ae1..add200c 100644
--- a/python-client/tcprelay.py
+++ b/python-client/tcprelay.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 #
 #       tcprelay.py - TCP connection relay for usbmuxd
 #
@@ -15,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 import usbmux
 import SocketServer
diff --git a/python-client/usbmux.py b/python-client/usbmux.py
index 47112d3..79ec26a 100644
--- a/python-client/usbmux.py
+++ b/python-client/usbmux.py
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+# -*- coding: utf-8 -*-
 #
 #       usbmux.py - usbmux client library for Python
 #
@@ -15,7 +16,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 import socket, struct, select, sys
 
diff --git a/tools/iproxy.c b/tools/iproxy.c
index 094ae75..07019ec 100644
--- a/tools/iproxy.c
+++ b/tools/iproxy.c
@@ -1,26 +1,30 @@
 /*
- * iproxy -- proxy that enables tcp service access to iPhone/iPod
- *  via USB cable
- * TODO: improve code...
- * 
- * Copyright (c) 2009 Nikias Bassen. All Rights Reserved.
- * Based upon iTunnel source code, Copyright (c) 2008 Jing Su.
- *  http://www.cs.toronto.edu/~jingsu/itunnel/
- *
- * 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 2 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, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
- */
+        iproxy -- proxy that enables tcp service access to iPhone/iPod
+
+Copyright (C) 2009      Nikias Bassen <nikias@gmx.li>
+Copyright (C) 2009      Paul Sladen <libiphone@paul.sladen.org>
+
+Based upon iTunnel source code, Copyright (c) 2008 Jing Su.
+http://www.cs.toronto.edu/~jingsu/itunnel/
+
+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 2 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, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+TODO: improve code...
+
+*/
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>