matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor fixes from Masahide for XFRM dynamic keying

This commit is contained in:
shemminger 2005-11-07 18:39:30 +00:00
parent c595c790a0
commit 669ae748d6
5 changed files with 75 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2005-11-07 Masahide NAKAMURA <nakam@linux-ipv6.org>
* Updating for 2.6.14
- Show UPD{SA,POLICY} message information from kernel instead of error
- Add lengh check of deleting message from kernel
- Use macro for struct xfrm_user{sa,policy}_id
* Minor fix:
- Add fflush at the end of normal dump
2005-11-01 Jamal Hadi Salim <hadi@znyx.com> 2005-11-01 Jamal Hadi Salim <hadi@znyx.com>
* Fix handling of XFRM monitor and state * Fix handling of XFRM monitor and state

6
ip/xfrm.h
View File

@ -39,6 +39,12 @@
#define XFRMP_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_userpolicy_info)))) #define XFRMP_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_userpolicy_info))))
#define XFRMP_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_userpoilcy_info)) #define XFRMP_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_userpoilcy_info))
#define XFRMSID_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_usersa_id))))
#define XFRMSID_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_usersa_id))
#define XFRMPID_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_userpolicy_id))))
#define XFRMPID_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct xfrm_userpoilcy_id))
#define XFRMACQ_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_user_acquire)))) #define XFRMACQ_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_user_acquire))))
#define XFRMEXP_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_user_expire)))) #define XFRMEXP_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_user_expire))))
#define XFRMPEXP_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_user_polexpire)))) #define XFRMPEXP_RTA(x) ((struct rtattr*)(((char*)(x)) + NLMSG_ALIGN(sizeof(struct xfrm_user_polexpire))))

19
ip/xfrm_monitor.c
View File

@ -103,6 +103,7 @@ static int xfrm_acquire_print(const struct sockaddr_nl *who,
if (oneline) if (oneline)
fprintf(fp, "\n"); fprintf(fp, "\n");
fflush(fp);
return 0; return 0;
} }
@ -116,14 +117,16 @@ static int xfrm_accept_msg(const struct sockaddr_nl *who,
print_timestamp(fp); print_timestamp(fp);
if (n->nlmsg_type == XFRM_MSG_NEWSA || if (n->nlmsg_type == XFRM_MSG_NEWSA ||
n->nlmsg_type == XFRM_MSG_DELSA || n->nlmsg_type == XFRM_MSG_DELSA ||
n->nlmsg_type == XFRM_MSG_UPDSA) { n->nlmsg_type == XFRM_MSG_UPDSA ||
n->nlmsg_type == XFRM_MSG_EXPIRE) {
xfrm_state_print(who, n, arg); xfrm_state_print(who, n, arg);
return 0; return 0;
} }
if (n->nlmsg_type == XFRM_MSG_NEWPOLICY || if (n->nlmsg_type == XFRM_MSG_NEWPOLICY ||
n->nlmsg_type == XFRM_MSG_DELPOLICY || n->nlmsg_type == XFRM_MSG_DELPOLICY ||
n->nlmsg_type == XFRM_MSG_UPDPOLICY) { n->nlmsg_type == XFRM_MSG_UPDPOLICY ||
n->nlmsg_type == XFRM_MSG_POLEXPIRE) {
xfrm_policy_print(who, n, arg); xfrm_policy_print(who, n, arg);
return 0; return 0;
} }
@ -132,14 +135,6 @@ static int xfrm_accept_msg(const struct sockaddr_nl *who,
xfrm_acquire_print(who, n, arg); xfrm_acquire_print(who, n, arg);
return 0; return 0;
} }
if (n->nlmsg_type == XFRM_MSG_EXPIRE) {
xfrm_state_print(who, n, arg);
return 0;
}
if (n->nlmsg_type == XFRM_MSG_POLEXPIRE) {
xfrm_policy_print(who, n, arg);
return 0;
}
if (n->nlmsg_type == XFRM_MSG_FLUSHSA) { if (n->nlmsg_type == XFRM_MSG_FLUSHSA) {
/* XXX: Todo: show proto in xfrm_usersa_flush */ /* XXX: Todo: show proto in xfrm_usersa_flush */
fprintf(fp, "Flushed state\n"); fprintf(fp, "Flushed state\n");

48
ip/xfrm_policy.c
View File

@ -345,24 +345,23 @@ int xfrm_policy_print(const struct sockaddr_nl *who, struct nlmsghdr *n,
if (n->nlmsg_type != XFRM_MSG_NEWPOLICY && if (n->nlmsg_type != XFRM_MSG_NEWPOLICY &&
n->nlmsg_type != XFRM_MSG_DELPOLICY && n->nlmsg_type != XFRM_MSG_DELPOLICY &&
n->nlmsg_type != XFRM_MSG_UPDPOLICY &&
n->nlmsg_type != XFRM_MSG_POLEXPIRE) { n->nlmsg_type != XFRM_MSG_POLEXPIRE) {
fprintf(stderr, "Not a policy: %08x %08x %08x\n", fprintf(stderr, "Not a policy: %08x %08x %08x\n",
n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags); n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags);
return 0; return 0;
} }
if (n->nlmsg_type == XFRM_MSG_POLEXPIRE) { if (n->nlmsg_type == XFRM_MSG_DELPOLICY) {
xpexp = NLMSG_DATA(n);
xpinfo = &xpexp->pol;
len -= NLMSG_LENGTH(sizeof(*xpexp));
} else if (n->nlmsg_type == XFRM_MSG_DELPOLICY) {
xpid = NLMSG_DATA(n); xpid = NLMSG_DATA(n);
len -= NLMSG_LENGTH(sizeof(*xpid)); len -= NLMSG_LENGTH(sizeof(*xpid));
} else if (n->nlmsg_type == XFRM_MSG_POLEXPIRE) {
xpexp = NLMSG_DATA(n);
xpinfo = &xpexp->pol;
len -= NLMSG_LENGTH(sizeof(*xpexp));
} else { } else {
xpexp = NULL; xpexp = NULL;
xpinfo = NLMSG_DATA(n); xpinfo = NLMSG_DATA(n);
len -= NLMSG_LENGTH(sizeof(*xpinfo)); len -= NLMSG_LENGTH(sizeof(*xpinfo));
} }
@ -371,31 +370,37 @@ int xfrm_policy_print(const struct sockaddr_nl *who, struct nlmsghdr *n,
return -1; return -1;
} }
if (!xfrm_policy_filter_match(xpinfo)) if (xpinfo && !xfrm_policy_filter_match(xpinfo))
return 0; return 0;
if (n->nlmsg_type == XFRM_MSG_POLEXPIRE) if (n->nlmsg_type == XFRM_MSG_DELPOLICY)
fprintf(fp, "Deleted ");
else if (n->nlmsg_type == XFRM_MSG_UPDPOLICY)
fprintf(fp, "Updated ");
else if (n->nlmsg_type == XFRM_MSG_POLEXPIRE)
fprintf(fp, "Expired ");
if (n->nlmsg_type == XFRM_MSG_DELPOLICY)
rta = XFRMPID_RTA(xpid);
else if (n->nlmsg_type == XFRM_MSG_POLEXPIRE)
rta = XFRMPEXP_RTA(xpexp); rta = XFRMPEXP_RTA(xpexp);
else if (n->nlmsg_type == XFRM_MSG_DELPOLICY)
rta = (struct rtattr*)(((char*)(xpid)) + NLMSG_ALIGN(sizeof(*xpid)));
else else
rta = XFRMP_RTA(xpinfo); rta = XFRMP_RTA(xpinfo);
parse_rtattr(tb, XFRMA_MAX, rta, len); parse_rtattr(tb, XFRMA_MAX, rta, len);
if (n->nlmsg_type == XFRM_MSG_DELPOLICY) { if (n->nlmsg_type == XFRM_MSG_DELPOLICY) {
fprintf(fp, "Deleted ");
//xfrm_policy_id_print(); //xfrm_policy_id_print();
if (!tb[XFRMA_POLICY]) {
if (tb[XFRMA_POLICY]) fprintf(stderr, "Buggy XFRM_MSG_DELPOLICY: no XFRMA_POLICY\n");
xpinfo = (struct xfrm_userpolicy_info *)RTA_DATA(tb[XFRMA_POLICY]); return -1;
else {
fprintf(stderr, "Buggy XFRM_MSG_DELPOLICY ");
return 0;
} }
if (RTA_PAYLOAD(tb[XFRMA_POLICY]) < sizeof(*xpinfo)) {
} else if (n->nlmsg_type == XFRM_MSG_POLEXPIRE) fprintf(stderr, "Buggy XFRM_MSG_DELPOLICY: too short XFRMA_POLICY len\n");
fprintf(fp, "Expired "); return -1;
}
xpinfo = (struct xfrm_userpolicy_info *)RTA_DATA(tb[XFRMA_POLICY]);
}
xfrm_policy_info_print(xpinfo, tb, fp, NULL, NULL); xfrm_policy_info_print(xpinfo, tb, fp, NULL, NULL);
@ -407,6 +412,7 @@ int xfrm_policy_print(const struct sockaddr_nl *who, struct nlmsghdr *n,
if (oneline) if (oneline)
fprintf(fp, "\n"); fprintf(fp, "\n");
fflush(fp);
return 0; return 0;
} }

46
ip/xfrm_state.c
View File

@ -565,25 +565,24 @@ int xfrm_state_print(const struct sockaddr_nl *who, struct nlmsghdr *n,
if (n->nlmsg_type != XFRM_MSG_NEWSA && if (n->nlmsg_type != XFRM_MSG_NEWSA &&
n->nlmsg_type != XFRM_MSG_DELSA && n->nlmsg_type != XFRM_MSG_DELSA &&
n->nlmsg_type != XFRM_MSG_UPDSA &&
n->nlmsg_type != XFRM_MSG_EXPIRE) { n->nlmsg_type != XFRM_MSG_EXPIRE) {
fprintf(stderr, "Not a state: %08x %08x %08x\n", fprintf(stderr, "Not a state: %08x %08x %08x\n",
n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags); n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags);
return 0; return 0;
} }
if (n->nlmsg_type == XFRM_MSG_EXPIRE) { if (n->nlmsg_type == XFRM_MSG_DELSA) {
xexp = NLMSG_DATA(n);
xsinfo = &xexp->state;
len -= NLMSG_LENGTH(sizeof(*xexp));
} else if (n->nlmsg_type == XFRM_MSG_DELSA) {
/* Dont blame me for this .. Herbert made me do it */ /* Dont blame me for this .. Herbert made me do it */
xsid = NLMSG_DATA(n); xsid = NLMSG_DATA(n);
len -= NLMSG_LENGTH(sizeof(struct xfrm_usersa_id)); len -= NLMSG_LENGTH(sizeof(*xsid));
} else if (n->nlmsg_type == XFRM_MSG_EXPIRE) {
xexp = NLMSG_DATA(n);
xsinfo = &xexp->state;
len -= NLMSG_LENGTH(sizeof(*xexp));
} else { } else {
xexp = NULL; xexp = NULL;
xsinfo = NLMSG_DATA(n); xsinfo = NLMSG_DATA(n);
len -= NLMSG_LENGTH(sizeof(*xsinfo)); len -= NLMSG_LENGTH(sizeof(*xsinfo));
} }
@ -592,33 +591,37 @@ int xfrm_state_print(const struct sockaddr_nl *who, struct nlmsghdr *n,
return -1; return -1;
} }
if (!xfrm_state_filter_match(xsinfo)) if (xsinfo && !xfrm_state_filter_match(xsinfo))
return 0; return 0;
if (n->nlmsg_type == XFRM_MSG_DELSA) { if (n->nlmsg_type == XFRM_MSG_DELSA)
fprintf(fp, "Deleted "); fprintf(fp, "Deleted ");
//xfrm_state_print_id(); else if (n->nlmsg_type == XFRM_MSG_UPDSA)
} fprintf(fp, "Updated ");
else if (n->nlmsg_type == XFRM_MSG_EXPIRE) else if (n->nlmsg_type == XFRM_MSG_EXPIRE)
fprintf(fp, "Expired "); fprintf(fp, "Expired ");
if (n->nlmsg_type == XFRM_MSG_EXPIRE) if (n->nlmsg_type == XFRM_MSG_DELSA)
rta = XFRMSID_RTA(xsid);
else if (n->nlmsg_type == XFRM_MSG_EXPIRE)
rta = XFRMEXP_RTA(xexp); rta = XFRMEXP_RTA(xexp);
else if (n->nlmsg_type == XFRM_MSG_DELSA)
rta = (struct rtattr*)(((char*)(xsid)) + NLMSG_ALIGN(sizeof(*xsid)));
else else
rta = XFRMS_RTA(xsinfo); rta = XFRMS_RTA(xsinfo);
parse_rtattr(tb, XFRMA_MAX, rta, len); parse_rtattr(tb, XFRMA_MAX, rta, len);
if (n->nlmsg_type == XFRM_MSG_DELSA) { if (n->nlmsg_type == XFRM_MSG_DELSA) {
if (tb[XFRMA_SA]) //xfrm_policy_id_print();
xsinfo = (struct xfrm_usersa_info *)RTA_DATA(tb[XFRMA_SA]);
else { if (!tb[XFRMA_SA]) {
fprintf(stderr, "Buggy XFRM_MSG_DELSA "); fprintf(stderr, "Buggy XFRM_MSG_DELSA: no XFRMA_SA\n");
return 0; return -1;
} }
if (RTA_PAYLOAD(tb[XFRMA_SA]) < sizeof(*xsinfo)) {
fprintf(stderr, "Buggy XFRM_MSG_DELPOLICY: too short XFRMA_POLICY len\n");
return -1;
}
xsinfo = (struct xfrm_usersa_info *)RTA_DATA(tb[XFRMA_SA]);
} }
xfrm_state_info_print(xsinfo, tb, fp, NULL, NULL); xfrm_state_info_print(xsinfo, tb, fp, NULL, NULL);
@ -631,6 +634,7 @@ int xfrm_state_print(const struct sockaddr_nl *who, struct nlmsghdr *n,
if (oneline) if (oneline)
fprintf(fp, "\n"); fprintf(fp, "\n");
fflush(fp);
return 0; return 0;
} }