proxmox-mirrors/mirror_iproute2
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_iproute2 synced 2025-10-04 18:10:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tc/pedit: make functions static

Browse Source 
The parse and pack functions are only used by the pedit routines.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
This commit is contained in:
Stephen Hemminger 2018-11-15 14:36:34 -08:00
parent 3f7bd0fd90
commit 7527b221d6
2 changed files with 14 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tc/m_pedit.c
View File

@ -118,7 +118,7 @@ noexist:
return p; return p;
} }
int pack_key(struct m_pedit_sel *_sel, struct m_pedit_key *tkey) static int pack_key(struct m_pedit_sel *_sel, struct m_pedit_key *tkey)
{ {
struct tc_pedit_sel *sel = &_sel->sel; struct tc_pedit_sel *sel = &_sel->sel;
struct m_pedit_key_ex *keys_ex = _sel->keys_ex; struct m_pedit_key_ex *keys_ex = _sel->keys_ex;
@ -155,8 +155,8 @@ int pack_key(struct m_pedit_sel *_sel, struct m_pedit_key *tkey)
return 0; return 0;
} }
int pack_key32(__u32 retain, struct m_pedit_sel *sel, static int pack_key32(__u32 retain, struct m_pedit_sel *sel,
struct m_pedit_key *tkey) struct m_pedit_key *tkey)
{ {
if (tkey->off > (tkey->off & ~3)) { if (tkey->off > (tkey->off & ~3)) {
fprintf(stderr, fprintf(stderr,
@ -169,8 +169,8 @@ int pack_key32(__u32 retain, struct m_pedit_sel *sel,
return pack_key(sel, tkey); return pack_key(sel, tkey);
} }
int pack_key16(__u32 retain, struct m_pedit_sel *sel, static int pack_key16(__u32 retain, struct m_pedit_sel *sel,
struct m_pedit_key *tkey) struct m_pedit_key *tkey)
{ {
int ind, stride; int ind, stride;
__u32 m[4] = { 0x0000FFFF, 0xFF0000FF, 0xFFFF0000 }; __u32 m[4] = { 0x0000FFFF, 0xFF0000FF, 0xFFFF0000 };
@ -197,10 +197,10 @@ int pack_key16(__u32 retain, struct m_pedit_sel *sel,
printf("pack_key16: Final val %08x mask %08x\n", printf("pack_key16: Final val %08x mask %08x\n",
tkey->val, tkey->mask); tkey->val, tkey->mask);
return pack_key(sel, tkey); return pack_key(sel, tkey);
} }
int pack_key8(__u32 retain, struct m_pedit_sel *sel, struct m_pedit_key *tkey) static int pack_key8(__u32 retain, struct m_pedit_sel *sel,
struct m_pedit_key *tkey)
{ {
int ind, stride; int ind, stride;
__u32 m[4] = { 0x00FFFFFF, 0xFF00FFFF, 0xFFFF00FF, 0xFFFFFF00 }; __u32 m[4] = { 0x00FFFFFF, 0xFF00FFFF, 0xFFFF00FF, 0xFFFFFF00 };
@ -283,7 +283,7 @@ static int pack_ipv6(struct m_pedit_sel *sel, struct m_pedit_key *tkey,
return 0; return 0;
} }
int parse_val(int *argc_p, char ***argv_p, __u32 *val, int type) static int parse_val(int *argc_p, char ***argv_p, __u32 *val, int type)
{ {
int argc = *argc_p; int argc = *argc_p;
char **argv = *argv_p; char **argv = *argv_p;
@ -433,8 +433,8 @@ done:
} }
int parse_offset(int *argc_p, char ***argv_p, struct m_pedit_sel *sel, static int parse_offset(int *argc_p, char ***argv_p, struct m_pedit_sel *sel,
struct m_pedit_key *tkey) struct m_pedit_key *tkey)
{ {
int off; int off;
__u32 len, retain; __u32 len, retain;
@ -612,8 +612,8 @@ static int pedit_keys_ex_addattr(struct m_pedit_sel *sel, struct nlmsghdr *n)
return 0; return 0;
} }
int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, static int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p,
struct nlmsghdr *n) int tca_id, struct nlmsghdr *n)
{ {
struct m_pedit_sel sel = {}; struct m_pedit_sel sel = {};
@ -705,7 +705,7 @@ int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,
return 0; return 0;
} }
const char *pedit_htype_str[] = { static const char * const pedit_htype_str[] = {
[TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK] = "", [TCA_PEDIT_KEY_EX_HDR_TYPE_NETWORK] = "",
[TCA_PEDIT_KEY_EX_HDR_TYPE_ETH] = "eth", [TCA_PEDIT_KEY_EX_HDR_TYPE_ETH] = "eth",
[TCA_PEDIT_KEY_EX_HDR_TYPE_IP4] = "ipv4", [TCA_PEDIT_KEY_EX_HDR_TYPE_IP4] = "ipv4",
@ -730,7 +730,7 @@ static void print_pedit_location(FILE *f,
fprintf(f, "%c%d", (int)off >= 0 ? '+' : '-', abs((int)off)); fprintf(f, "%c%d", (int)off >= 0 ? '+' : '-', abs((int)off));
} }
int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg) static int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg)
{ {
struct tc_pedit_sel *sel; struct tc_pedit_sel *sel;
struct rtattr *tb[TCA_PEDIT_MAX + 1]; struct rtattr *tb[TCA_PEDIT_MAX + 1];
@ -826,11 +826,6 @@ int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg)
return 0; return 0;
} }
int pedit_print_xstats(struct action_util *au, FILE *f, struct rtattr *xstats)
{
return 0;
}
struct action_util pedit_action_util = { struct action_util pedit_action_util = {
.id = "pedit", .id = "pedit",
.parse_aopt = parse_pedit, .parse_aopt = parse_pedit,

15
tc/m_pedit.h
View File

@ -71,22 +71,7 @@ struct m_pedit_util {
struct m_pedit_key *tkey); struct m_pedit_key *tkey);
}; };
int pack_key(struct m_pedit_sel *sel, struct m_pedit_key *tkey);
int pack_key32(__u32 retain, struct m_pedit_sel *sel,
struct m_pedit_key *tkey);
int pack_key16(__u32 retain, struct m_pedit_sel *sel,
struct m_pedit_key *tkey);
int pack_key8(__u32 retain, struct m_pedit_sel *sel,
struct m_pedit_key *tkey);
int parse_val(int *argc_p, char ***argv_p, __u32 *val, int type);
int parse_cmd(int *argc_p, char ***argv_p, __u32 len, int type, int parse_cmd(int *argc_p, char ***argv_p, __u32 len, int type,
__u32 retain, __u32 retain,
struct m_pedit_sel *sel, struct m_pedit_key *tkey); struct m_pedit_sel *sel, struct m_pedit_key *tkey);
int parse_offset(int *argc_p, char ***argv_p,
struct m_pedit_sel *sel, struct m_pedit_key *tkey);
int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p,
int tca_id, struct nlmsghdr *n);
int print_pedit(struct action_util *au, FILE *f, struct rtattr *arg);
int pedit_print_xstats(struct action_util *au, FILE *f,
struct rtattr *xstats);
#endif #endif