afb-method: creation

also changed the licensing

Change-Id: Ib50a6991b066a00363f36688dd485c7772014088
Signed-off-by: jobol <jobol@nonadev.net>

5 files changed, 343 insertions, 86 deletions

diff --git a/LICENSE-2.0.txt b/LICENSE-2.0.txt
new file mode 100644
index 00000000..d6456956
--- /dev/null
+++ b/LICENSE-2.0.txt
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aad78e16..c3537dc6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,2 +1,12 @@
-ADD_LIBRARY(src OBJECT main.c config.c session.c http-svc.c rest-api.c helper-api.c)
+
+ADD_LIBRARY(src OBJECT
+	main.c
+	config.c
+	session.c
+	http-svc.c
+	rest-api.c
+	afb-method.c
+	helper-api.c)
+
 INCLUDE_DIRECTORIES(${include_dirs})
+
diff --git a/src/afb-method.c b/src/afb-method.c
new file mode 100644
index 00000000..488ba3e3
--- /dev/null
+++ b/src/afb-method.c
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2016 IoT.bzh
+ * Author: José Bollo <jose.bollo@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+#include <microhttpd.h>
+
+#include "afb-method.h"
+
+enum afb_method get_method(const char *method)
+{
+	switch (method[0] & ~' ') {
+	case 'C':
+		return afb_method_connect;
+	case 'D':
+		return afb_method_delete;
+	case 'G':
+		return afb_method_get;
+	case 'H':
+		return afb_method_head;
+	case 'O':
+		return afb_method_options;
+	case 'P':
+		switch (method[1] & ~' ') {
+		case 'A':
+			return afb_method_patch;
+		case 'O':
+			return afb_method_post;
+		case 'U':
+			return afb_method_put;
+		}
+		break;
+	case 'T':
+		return afb_method_trace;
+	}
+	return afb_method_none;
+}
+
+#if !defined(MHD_HTTP_METHOD_PATCH)
+#define MHD_HTTP_METHOD_PATCH "PATCH"
+#endif
+const char *get_method_name(enum afb_method method)
+{
+	switch (method) {
+	case afb_method_get:
+		return MHD_HTTP_METHOD_GET;
+	case afb_method_post:
+		return MHD_HTTP_METHOD_POST;
+	case afb_method_head:
+		return MHD_HTTP_METHOD_HEAD;
+	case afb_method_connect:
+		return MHD_HTTP_METHOD_CONNECT;
+	case afb_method_delete:
+		return MHD_HTTP_METHOD_DELETE;
+	case afb_method_options:
+		return MHD_HTTP_METHOD_OPTIONS;
+	case afb_method_patch:
+		return MHD_HTTP_METHOD_PATCH;
+	case afb_method_put:
+		return MHD_HTTP_METHOD_PUT;
+	case afb_method_trace:
+		return MHD_HTTP_METHOD_TRACE;
+	default:
+		return NULL;
+	}
+}
+
+
diff --git a/src/afb-method.h b/src/afb-method.h
new file mode 100644
index 00000000..fde9dbfc
--- /dev/null
+++ b/src/afb-method.h
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2016 IoT.bzh
+ * Author: José Bollo <jose.bollo@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+enum afb_method {
+	afb_method_none = 0,
+	afb_method_get = 1,
+	afb_method_post = 2,
+	afb_method_head = 4,
+	afb_method_connect = 8,
+	afb_method_delete = 16,
+	afb_method_options = 32,
+	afb_method_patch = 64,
+	afb_method_put = 128,
+	afb_method_trace = 256,
+	afb_method_all = 511
+};
+
+extern enum afb_method get_method(const char *method);
+extern const char *get_method_name(enum afb_method method);
+
diff --git a/src/http-svc.c b/src/http-svc.c
index fa0440b9..8af11d2e 100644
--- a/src/http-svc.c
+++ b/src/http-svc.c
@@ -1,42 +1,29 @@
 /*
- * Copyright (C) 2016 "IoT.bzh"
- * Author José Bollo
+ * Copyright 2016 IoT.bzh
+ * Author: José Bollo <jose.bollo@iot.bzh>
  *
- * 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.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * 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.
+ *   http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
+
 #define _GNU_SOURCE
 #include <microhttpd.h>
 #include <assert.h>
 #include <poll.h>
 #include <sys/stat.h>
-#include "../include/local-def.h"
-
 
+#include "../include/local-def.h"
+#include "afb-method.h"
 
-enum afb_method {
-	afb_method_none = 0,
-	afb_method_get = 1,
-	afb_method_post = 2,
-	afb_method_head = 4,
-	afb_method_connect = 8,
-	afb_method_delete = 16,
-	afb_method_options = 32,
-	afb_method_patch = 64,
-	afb_method_put = 128,
-	afb_method_trace = 256,
-	afb_method_all = 511
-};
 
 struct afb_req_post {
 	const char *upload_data;
@@ -68,64 +55,6 @@ struct afb_req_handler {
 
 static char empty_string[1] = "";
 
-enum afb_method get_method(const char *method)
-{
-	switch (method[0] & ~' ') {
-	case 'C':
-		return afb_method_connect;
-	case 'D':
-		return afb_method_delete;
-	case 'G':
-		return afb_method_get;
-	case 'H':
-		return afb_method_head;
-	case 'O':
-		return afb_method_options;
-	case 'P':
-		switch (method[1] & ~' ') {
-		case 'A':
-			return afb_method_patch;
-		case 'O':
-			return afb_method_post;
-		case 'U':
-			return afb_method_put;
-		}
-		break;
-	case 'T':
-		return afb_method_trace;
-	}
-	return afb_method_none;
-}
-
-#if !defined(MHD_HTTP_METHOD_PATCH)
-#define MHD_HTTP_METHOD_PATCH "PATCH"
-#endif
-const char *get_method_name(enum afb_method method)
-{
-	switch (method) {
-	case afb_method_get:
-		return MHD_HTTP_METHOD_GET;
-	case afb_method_post:
-		return MHD_HTTP_METHOD_POST;
-	case afb_method_head:
-		return MHD_HTTP_METHOD_HEAD;
-	case afb_method_connect:
-		return MHD_HTTP_METHOD_CONNECT;
-	case afb_method_delete:
-		return MHD_HTTP_METHOD_DELETE;
-	case afb_method_options:
-		return MHD_HTTP_METHOD_OPTIONS;
-	case afb_method_patch:
-		return MHD_HTTP_METHOD_PATCH;
-	case afb_method_put:
-		return MHD_HTTP_METHOD_PUT;
-	case afb_method_trace:
-		return MHD_HTTP_METHOD_TRACE;
-	default:
-		return NULL;
-	}
-}
-
 /* a valid subpath is a relative path not looking deeper than root using .. */
 static int validsubpath(const char *subpath)
 {