DGNum/rpcd
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

session.c: use blobmsg_type() instead of blob_id()

Browse source
This commit is contained in:
Jo-Philipp Wich 2013-09-12 13:31:21 +02:00
parent 296c9d9ceb
commit 22c7c2675d
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
session.c
View file

@ -526,14 +526,14 @@ rpc_handle_acl(struct ubus_context *ctx, struct ubus_object *obj,
return cb(ses, scope, NULL, NULL); return cb(ses, scope, NULL, NULL);
blobmsg_for_each_attr(attr, tb[RPC_SA_OBJECTS], rem1) { blobmsg_for_each_attr(attr, tb[RPC_SA_OBJECTS], rem1) {
if (blob_id(attr) != BLOBMSG_TYPE_ARRAY) if (blobmsg_type(attr) != BLOBMSG_TYPE_ARRAY)
continue; continue;
object = NULL; object = NULL;
function = NULL; function = NULL;
blobmsg_for_each_attr(sattr, attr, rem2) { blobmsg_for_each_attr(sattr, attr, rem2) {
if (blob_id(sattr) != BLOBMSG_TYPE_STRING) if (blobmsg_type(sattr) != BLOBMSG_TYPE_STRING)
continue; continue;
if (!object) if (!object)
@ -676,7 +676,7 @@ rpc_handle_get(struct ubus_context *ctx, struct ubus_object *obj,
if (tb[RPC_SG_KEYS]) if (tb[RPC_SG_KEYS])
blobmsg_for_each_attr(attr, tb[RPC_SG_KEYS], rem) { blobmsg_for_each_attr(attr, tb[RPC_SG_KEYS], rem) {
if (blob_id(attr) != BLOBMSG_TYPE_STRING) if (blobmsg_type(attr) != BLOBMSG_TYPE_STRING)
continue; continue;
data = avl_find_element(&ses->data, blobmsg_data(attr), data, avl); data = avl_find_element(&ses->data, blobmsg_data(attr), data, avl);
@ -724,7 +724,7 @@ rpc_handle_unset(struct ubus_context *ctx, struct ubus_object *obj,
} }
blobmsg_for_each_attr(attr, tb[RPC_SG_KEYS], rem) { blobmsg_for_each_attr(attr, tb[RPC_SG_KEYS], rem) {
if (blob_id(attr) != BLOBMSG_TYPE_STRING) if (blobmsg_type(attr) != BLOBMSG_TYPE_STRING)
continue; continue;
data = avl_find_element(&ses->data, blobmsg_data(attr), data, avl); data = avl_find_element(&ses->data, blobmsg_data(attr), data, avl);
@ -936,13 +936,13 @@ rpc_login_setup_acl_scope(struct rpc_session *ses,
* ] * ]
* } * }
*/ */
if (blob_id(acl_scope) == BLOBMSG_TYPE_TABLE) { if (blobmsg_type(acl_scope) == BLOBMSG_TYPE_TABLE) {
blobmsg_for_each_attr(acl_obj, acl_scope, rem) { blobmsg_for_each_attr(acl_obj, acl_scope, rem) {
if (blob_id(acl_obj) != BLOBMSG_TYPE_ARRAY) if (blobmsg_type(acl_obj) != BLOBMSG_TYPE_ARRAY)
continue; continue;
blobmsg_for_each_attr(acl_func, acl_obj, rem2) { blobmsg_for_each_attr(acl_func, acl_obj, rem2) {
if (blob_id(acl_func) != BLOBMSG_TYPE_STRING) if (blobmsg_type(acl_func) != BLOBMSG_TYPE_STRING)
continue; continue;
rpc_session_grant(ses, blobmsg_name(acl_scope), rpc_session_grant(ses, blobmsg_name(acl_scope),
@ -962,9 +962,9 @@ rpc_login_setup_acl_scope(struct rpc_session *ses,
* ... * ...
* ] * ]
*/ */
else if (blob_id(acl_scope) == BLOBMSG_TYPE_ARRAY) { else if (blobmsg_type(acl_scope) == BLOBMSG_TYPE_ARRAY) {
blobmsg_for_each_attr(acl_obj, acl_scope, rem) { blobmsg_for_each_attr(acl_obj, acl_scope, rem) {
if (blob_id(acl_obj) != BLOBMSG_TYPE_STRING) if (blobmsg_type(acl_obj) != BLOBMSG_TYPE_STRING)
continue; continue;
rpc_session_grant(ses, blobmsg_name(acl_scope), rpc_session_grant(ses, blobmsg_name(acl_scope),
@ -993,7 +993,7 @@ rpc_login_setup_acl_file(struct rpc_session *ses, struct uci_section *login,
blob_for_each_attr(acl_group, acl.head, rem) { blob_for_each_attr(acl_group, acl.head, rem) {
/* Iterate permission objects in each access group object */ /* Iterate permission objects in each access group object */
blobmsg_for_each_attr(acl_perm, acl_group, rem2) { blobmsg_for_each_attr(acl_perm, acl_group, rem2) {
if (blob_id(acl_perm) != BLOBMSG_TYPE_TABLE) if (blobmsg_type(acl_perm) != BLOBMSG_TYPE_TABLE)
continue; continue;
/* Only "read" and "write" permissions are defined */ /* Only "read" and "write" permissions are defined */