aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2015-01-22 23:59:22 +0200
committerSergey Poznyakoff <gray@gnu.org.ua>2015-01-23 00:03:33 +0200
commitb1824338b366e25756e4c64f04e535684529832d (patch)
tree2dcbf32e0b4fb06b1c4b0a992db882ba184bbd18 /lib
parent2beaaadb282bd4667e3af1ed65e3944960d1bd3e (diff)
downloadeclat-b1824338b366e25756e4c64f04e535684529832d.tar.gz
eclat-b1824338b366e25756e4c64f04e535684529832d.tar.bz2
Namespace fixup: use "request" consistently
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am10
-rw-r--r--lib/libeclat.h24
-rw-r--r--lib/req2url.c (renamed from lib/q2url.c)6
-rw-r--r--lib/reqaddparm.c (renamed from lib/qaddparm.c)28
-rw-r--r--lib/reqcreat.c (renamed from lib/qcreat.c)26
-rw-r--r--lib/reqencode.c (renamed from lib/qencode.c)4
-rw-r--r--lib/reqfree.c (renamed from lib/qfree.c)10
-rw-r--r--lib/reqsign.c56
8 files changed, 83 insertions, 81 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index bdc7d76..5cfa67a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -54,11 +54,11 @@ libeclat_a_SOURCES=\
libeclat.h\
map.c\
path.c\
- q2url.c\
- qaddparm.c\
- qcreat.c\
- qencode.c\
- qfree.c\
+ req2url.c\
+ reqaddparm.c\
+ reqcreat.c\
+ reqencode.c\
+ reqfree.c\
reqsign.c\
sha1.c\
sha1.h\
diff --git a/lib/libeclat.h b/lib/libeclat.h
index edd26eb..a5c8c79 100644
--- a/lib/libeclat.h
+++ b/lib/libeclat.h
@@ -85,11 +85,11 @@ struct ec2_param {
#define EC2_API_VERSION "2013-02-01"
-#define EC2_QF_HTTPS 0x01
-#define EC2_QF_POST 0x02
+#define EC2_RF_HTTPS 0x01
+#define EC2_RF_POST 0x02
-struct ec2_query {
- int flags; /* Composed from EC2_QF_* bits */
+struct ec2_request {
+ int flags; /* Composed from EC2_RF_* bits */
char *endpoint; /* endpoint */
char *uri; /* URI without parameters */
struct grecs_symtab *params; /* Query parameters */
@@ -100,22 +100,22 @@ struct ec2_query {
unsigned long ttl; /* Time-to-live in seconds */
};
-struct ec2_query *eclat_query_create(int flags, const char *endpoint,
+struct ec2_request *eclat_request_create(int flags, const char *endpoint,
const char *uri, char const *region,
char const *access_key, char const *token);
-void eclat_query_free(struct ec2_query *);
-void eclat_query_add_param(struct ec2_query *q, const char *name,
+void eclat_request_free(struct ec2_request *);
+void eclat_request_add_param(struct ec2_request *q, const char *name,
const char *value);
-void eclat_query_add_param_encoded(struct ec2_query *q, const char *name,
+void eclat_request_add_param_encoded(struct ec2_request *q, const char *name,
const char *value);
-void eclat_query_add_header(struct ec2_query *q, const char *name,
+void eclat_request_add_header(struct ec2_request *q, const char *name,
const char *value);
-void eclat_query_sign(struct ec2_query *req, char *secret, char *version);
+void eclat_request_sign(struct ec2_request *req, char *secret, char *version);
-char *eclat_query_to_url(struct ec2_query *req, char **post_params);
+char *eclat_request_to_url(struct ec2_request *req, char **post_params);
-void eclat_query_encode(struct ec2_query *q);
+void eclat_request_encode(struct ec2_request *q);
typedef struct eclat_partial_tree *eclat_partial_tree_t;
diff --git a/lib/q2url.c b/lib/req2url.c
index 6404f33..25277a2 100644
--- a/lib/q2url.c
+++ b/lib/req2url.c
@@ -43,7 +43,7 @@ add_param(void *sym, void *data)
}
char *
-eclat_query_to_url(struct ec2_query *req, char **post_params)
+eclat_request_to_url(struct ec2_request *req, char **post_params)
{
struct grecs_txtacc *acc;
char *ret = NULL, *p;
@@ -52,13 +52,13 @@ eclat_query_to_url(struct ec2_query *req, char **post_params)
acc = grecs_txtacc_create();
grecs_txtacc_grow(acc, "http", 4);
- if (req->flags & EC2_QF_HTTPS)
+ if (req->flags & EC2_RF_HTTPS)
grecs_txtacc_grow_char(acc, 's');
grecs_txtacc_grow(acc, "://", 3);
grecs_txtacc_grow(acc, req->endpoint, strlen(req->endpoint));
grecs_txtacc_grow(acc, req->uri, strlen(req->uri));
- if (req->flags & EC2_QF_POST) {
+ if (req->flags & EC2_RF_POST) {
grecs_txtacc_grow_char(acc, 0);
ret = grecs_txtacc_finish(acc, 1);
} else {
diff --git a/lib/qaddparm.c b/lib/reqaddparm.c
index 7328534..916bf92 100644
--- a/lib/qaddparm.c
+++ b/lib/reqaddparm.c
@@ -20,14 +20,14 @@
#include "grecs.h"
void
-eclat_query_add_param0(struct ec2_query *q, const char *name,
+eclat_request_add_param0(struct ec2_request *req, const char *name,
const char *value, int encoded)
{
struct ec2_param *p, key;
int install = 1;
key.name = (char*) name;
- p = grecs_symtab_lookup_or_install(q->params, &key, &install);
+ p = grecs_symtab_lookup_or_install(req->params, &key, &install);
if (!install)
free(p->value);
p->value = value ? grecs_strdup(value) : NULL;
@@ -35,22 +35,23 @@ eclat_query_add_param0(struct ec2_query *q, const char *name,
}
void
-eclat_query_add_param(struct ec2_query *q, const char *name, const char *value)
+eclat_request_add_param(struct ec2_request *req, const char *name,
+ const char *value)
{
- eclat_query_add_param0(q, name, value, 0);
+ eclat_request_add_param0(req, name, value, 0);
}
void
-eclat_query_add_param_encoded(struct ec2_query *q, const char *name,
- const char *value)
+eclat_request_add_param_encoded(struct ec2_request *req, const char *name,
+ const char *value)
{
if (value) {
char *str;
urlencode(value, strlen(value), &str, NULL);
- eclat_query_add_param0(q, name, str, 1);
+ eclat_request_add_param0(req, name, str, 1);
free(str);
} else
- eclat_query_add_param0(q, name, value, 1);
+ eclat_request_add_param0(req, name, value, 1);
}
@@ -64,13 +65,14 @@ free_header(void *data)
}
void
-eclat_query_add_header(struct ec2_query *q, const char *name, const char *value)
+eclat_request_add_header(struct ec2_request *req, const char *name,
+ const char *value)
{
struct ec2_param *ent;
- if (!q->headers) {
- q->headers = grecs_list_create();
- q->headers->free_entry = free_header;
+ if (!req->headers) {
+ req->headers = grecs_list_create();
+ req->headers->free_entry = free_header;
}
ent = grecs_malloc(sizeof(*ent));
ent->name = grecs_strdup(name);
@@ -87,5 +89,5 @@ eclat_query_add_header(struct ec2_query *q, const char *name, const char *value)
ent->value[len] = 0;
} else
ent->value = NULL;
- grecs_list_append(q->headers, ent);
+ grecs_list_append(req->headers, ent);
}
diff --git a/lib/qcreat.c b/lib/reqcreat.c
index 3028b4f..65f7880 100644
--- a/lib/qcreat.c
+++ b/lib/reqcreat.c
@@ -27,25 +27,25 @@ ec2_param_free(void *ptr)
free(p);
}
-struct ec2_query *
-eclat_query_create(int flags, const char *endpoint, const char *uri,
+struct ec2_request *
+eclat_request_create(int flags, const char *endpoint, const char *uri,
char const *region, char const *access_key,
char const *token)
{
- struct ec2_query *q = grecs_zalloc(sizeof(*q));
- q->flags = flags;
- q->params = grecs_symtab_create(sizeof(struct ec2_param),
+ struct ec2_request *req = grecs_zalloc(sizeof(*req));
+ req->flags = flags;
+ req->params = grecs_symtab_create(sizeof(struct ec2_param),
NULL,
NULL,
NULL,
NULL,
ec2_param_free);
- eclat_query_add_param(q, "Version", EC2_API_VERSION);
- q->endpoint = grecs_strdup(endpoint);
- q->uri = grecs_strdup(uri);
- q->ttl = 5;
- q->region = grecs_strdup(region ? region : "us-east-1");
- q->access_key = grecs_strdup(access_key);
- q->token = token ? grecs_strdup(token) : NULL;
- return q;
+ eclat_request_add_param(req, "Version", EC2_API_VERSION);
+ req->endpoint = grecs_strdup(endpoint);
+ req->uri = grecs_strdup(uri);
+ req->ttl = 5;
+ req->region = grecs_strdup(region ? region : "us-east-1");
+ req->access_key = grecs_strdup(access_key);
+ req->token = token ? grecs_strdup(token) : NULL;
+ return req;
}
diff --git a/lib/qencode.c b/lib/reqencode.c
index bb4284c..70ac16d 100644
--- a/lib/qencode.c
+++ b/lib/reqencode.c
@@ -35,8 +35,8 @@ encode_param(void *sym, void *data)
}
void
-eclat_query_encode(struct ec2_query *q)
+eclat_request_encode(struct ec2_request *req)
{
- grecs_symtab_enumerate(q->params, encode_param, NULL);
+ grecs_symtab_enumerate(req->params, encode_param, NULL);
}
diff --git a/lib/qfree.c b/lib/reqfree.c
index bbdc991..f5145a4 100644
--- a/lib/qfree.c
+++ b/lib/reqfree.c
@@ -19,11 +19,11 @@
#include "grecs.h"
void
-eclat_query_free(struct ec2_query *q)
+eclat_request_free(struct ec2_request *req)
{
- free(q->endpoint);
- free(q->uri);
- grecs_symtab_free(q->params);
- free(q);
+ free(req->endpoint);
+ free(req->uri);
+ grecs_symtab_free(req->params);
+ free(req);
}
diff --git a/lib/reqsign.c b/lib/reqsign.c
index 6acf80e..f3083c6 100644
--- a/lib/reqsign.c
+++ b/lib/reqsign.c
@@ -44,7 +44,7 @@ compnames(const void *a, const void *b)
}
static void
-querysign2(struct ec2_query *req, char *secret)
+requestsign2(struct ec2_request *req, char *secret)
{
char **pnames;
size_t i, n;
@@ -61,17 +61,17 @@ querysign2(struct ec2_query *req, char *secret)
acc = grecs_txtacc_create();
/* Add default parameters */
- eclat_query_add_param(req, "AWSAccessKeyId", req->access_key);
- eclat_query_add_param(req, "SignatureMethod", "HmacSHA256");
- eclat_query_add_param(req, "SignatureVersion", "2");
+ eclat_request_add_param(req, "AWSAccessKeyId", req->access_key);
+ eclat_request_add_param(req, "SignatureMethod", "HmacSHA256");
+ eclat_request_add_param(req, "SignatureVersion", "2");
if (req->token)
- eclat_query_add_param(req, "SecurityToken", req->token);
+ eclat_request_add_param(req, "SecurityToken", req->token);
time(&t);
strftime(tsbuf, sizeof(tsbuf), "%Y-%m-%dT%H:%M:%SZ", gmtime(&t));
- eclat_query_add_param(req, "Timestamp", tsbuf);
+ eclat_request_add_param(req, "Timestamp", tsbuf);
- eclat_query_encode(req);
+ eclat_request_encode(req);
/* Collect and sort parameter names */
n = grecs_symtab_count_entries(req->params);
@@ -81,7 +81,7 @@ querysign2(struct ec2_query *req, char *secret)
grecs_symtab_enumerate(req->params, get_param_name, &pn);
qsort(pnames, n, sizeof(pnames[0]), compnames);
- verb = (req->flags & EC2_QF_POST) ? "POST" : "GET";
+ verb = (req->flags & EC2_RF_POST) ? "POST" : "GET";
grecs_txtacc_grow_string(acc, verb);
grecs_txtacc_grow_char(acc, '\n');
grecs_txtacc_grow_string(acc, req->endpoint);
@@ -89,7 +89,7 @@ querysign2(struct ec2_query *req, char *secret)
grecs_txtacc_grow_string(acc, req->uri);
grecs_txtacc_grow_char(acc, '\n');
- /* Append a canonicalized query string */
+ /* Append a canonicalized request string */
for (i = 0; i < n; i++) {
struct ec2_param *p, key;
@@ -112,7 +112,7 @@ querysign2(struct ec2_query *req, char *secret)
eclat_base64_encode((unsigned char *)digest, sizeof(digest),
(unsigned char**) &signature, &siglen);
- eclat_query_add_param_encoded(req, "Signature", signature);
+ eclat_request_add_param_encoded(req, "Signature", signature);
free(signature);
grecs_txtacc_free(acc);
@@ -121,7 +121,7 @@ querysign2(struct ec2_query *req, char *secret)
/*FIXME
t += req->ttl;
strftime(tsbuf, sizeof(tsbuf), "%Y-%m-%dT%H:%M:%SZ", gmtime(&t));
- eclat_query_add_param(req, "Expires", tsbuf);
+ eclat_request_add_param(req, "Expires", tsbuf);
*/
}
@@ -148,7 +148,7 @@ eclat_hex_encode(unsigned char *input, size_t inlen,
/* Ref. http://docs.aws.amazon.com/general/latest/gr/sigv4-create-canonical-request.html
*/
static void
-querysign4(struct ec2_query *req, char *secret)
+requestsign4(struct ec2_request *req, char *secret)
{
char **pnames;
struct pname pn;
@@ -196,11 +196,11 @@ querysign4(struct ec2_query *req, char *secret)
grecs_txtacc_grow_char(acc, 0);
credential = grecs_txtacc_finish(acc, 0);
- eclat_query_add_header(req, "Host", req->endpoint);
- eclat_query_add_header(req, "X-Amz-Date", tsbuf);
+ eclat_request_add_header(req, "Host", req->endpoint);
+ eclat_request_add_header(req, "X-Amz-Date", tsbuf);
- /* Encode the query */
- eclat_query_encode(req);
+ /* Encode the request */
+ eclat_request_encode(req);
/* Collect and sort parameter names */
n = grecs_symtab_count_entries(req->params);
@@ -211,12 +211,12 @@ querysign4(struct ec2_query *req, char *secret)
qsort(pnames, n, sizeof(pnames[0]), compnames);
/* Create a canonical request */
- verb = (req->flags & EC2_QF_POST) ? "POST" : "GET";
+ verb = (req->flags & EC2_RF_POST) ? "POST" : "GET";
grecs_txtacc_grow_string(acc, verb);
grecs_txtacc_grow_char(acc, '\n');
grecs_txtacc_grow_string(acc, req->uri);
grecs_txtacc_grow_char(acc, '\n');
- /* Append a canonicalized query string */
+ /* Append a canonicalized request string */
for (i = 0; i < n; i++) {
struct ec2_param *p, key;
@@ -251,8 +251,8 @@ querysign4(struct ec2_query *req, char *secret)
grecs_txtacc_grow_string(acc, signed_headers);
grecs_txtacc_grow_char(acc, '\n');
/* Payload hash */
- if (req->flags & EC2_QF_POST) {
- /* FIXME: payload = req->query */
+ if (req->flags & EC2_RF_POST) {
+ /* FIXME: payload = req->request */
err("%s:%d: POST is not yet implemented", __FILE__, __LINE__);
abort();
} else
@@ -319,7 +319,7 @@ querysign4(struct ec2_query *req, char *secret)
&signature, &hashsize);
if (req->token)
- eclat_query_add_header(req, "X-Amz-Security-Token", req->token);
+ eclat_request_add_header(req, "X-Amz-Security-Token", req->token);
/* Build authorization header */
grecs_txtacc_grow_string(acc, algostr);
@@ -331,28 +331,28 @@ querysign4(struct ec2_query *req, char *secret)
grecs_txtacc_grow_string(acc, signature);
grecs_txtacc_grow_char(acc, 0);
p = grecs_txtacc_finish(acc, 0);
- eclat_query_add_header(req, "Authorization", p);
+ eclat_request_add_header(req, "Authorization", p);
free(signature);
grecs_txtacc_free(acc);
- /* Encode the query */
- eclat_query_encode(req);
+ /* Encode the request */
+ eclat_request_encode(req);
}
struct qsimpl {
char *qs_version;
- void (*qs_fun)(struct ec2_query *, char *);
+ void (*qs_fun)(struct ec2_request *, char *);
};
static struct qsimpl qstab[] = {
- { "2", querysign2 },
- { "4", querysign4 },
+ { "2", requestsign2 },
+ { "4", requestsign4 },
{ NULL }
};
void
-eclat_query_sign(struct ec2_query *req, char *secret, char *version)
+eclat_request_sign(struct ec2_request *req, char *secret, char *version)
{
struct qsimpl *qs;

Return to:

Send suggestions and report system problems to the System administrator.