diff options
author | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2019-03-09 08:40:57 +0000 |
---|---|---|
committer | Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> | 2019-07-25 12:23:46 +0100 |
commit | e9eec39aacde450ba87598d85987b374ce6aed95 (patch) | |
tree | 3823546edc4d7228951ea9e37f55f6fea3f06833 /package/network/services/dnsmasq/patches/0043-Remove-redundant-prototypes-from-dnsmasq.h.patch | |
parent | 7d684b7673a7cb4f3fef366dd4f621f62fc4019c (diff) | |
download | upstream-e9eec39aacde450ba87598d85987b374ce6aed95.tar.gz upstream-e9eec39aacde450ba87598d85987b374ce6aed95.tar.bz2 upstream-e9eec39aacde450ba87598d85987b374ce6aed95.zip |
dnsmasq: backport latest patches
Backport upstream patches pre 2.81rc for testing purposes.
Let's see what falls out!
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
Diffstat (limited to 'package/network/services/dnsmasq/patches/0043-Remove-redundant-prototypes-from-dnsmasq.h.patch')
-rw-r--r-- | package/network/services/dnsmasq/patches/0043-Remove-redundant-prototypes-from-dnsmasq.h.patch | 44 |
1 files changed, 44 insertions, 0 deletions
diff --git a/package/network/services/dnsmasq/patches/0043-Remove-redundant-prototypes-from-dnsmasq.h.patch b/package/network/services/dnsmasq/patches/0043-Remove-redundant-prototypes-from-dnsmasq.h.patch new file mode 100644 index 0000000000..1f5edec713 --- /dev/null +++ b/package/network/services/dnsmasq/patches/0043-Remove-redundant-prototypes-from-dnsmasq.h.patch @@ -0,0 +1,44 @@ +From c61c7bb2257059fe1e14851289594415eb0659d7 Mon Sep 17 00:00:00 2001 +From: Dominik DL6ER <dl6er@dl6er.de> +Date: Sun, 10 Mar 2019 19:37:57 +0100 +Subject: [PATCH 43/57] Remove redundant prototypes from dnsmasq.h + +Dear Simon, + +the attached patch removes three redundant prototypes from dnsmasq.h. There is no functional change. + +Best regards, +Dominik + +From c0b2ccfd20c4eec9d09468fdfe9b4ca8a8f8591e Mon Sep 17 00:00:00 2001 +From: DL6ER <dl6er@dl6er.de> +Date: Sun, 10 Mar 2019 19:34:07 +0100 +Subject: [PATCH] Remove redundant prototypes from dnsmasq.h + +Signed-off-by: DL6ER <dl6er@dl6er.de> +Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> +--- + src/dnsmasq.h | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/src/dnsmasq.h ++++ b/src/dnsmasq.h +@@ -1205,9 +1205,6 @@ size_t resize_packet(struct dns_header * + int add_resource_record(struct dns_header *header, char *limit, int *truncp, + int nameoffset, unsigned char **pp, unsigned long ttl, + int *offset, unsigned short type, unsigned short class, char *format, ...); +-unsigned char *skip_questions(struct dns_header *header, size_t plen); +-int extract_name(struct dns_header *header, size_t plen, unsigned char **pp, +- char *name, int isExtract, int extrabytes); + int in_arpa_name_2_addr(char *namein, union all_addr *addrp); + int private_net(struct in_addr addr, int ban_localhost); + +@@ -1545,8 +1542,6 @@ void dhcp_update_configs(struct dhcp_con + void display_opts(void); + int lookup_dhcp_opt(int prot, char *name); + int lookup_dhcp_len(int prot, int val); +-char *option_string(int prot, unsigned int opt, unsigned char *val, +- int opt_len, char *buf, int buf_len); + struct dhcp_config *find_config(struct dhcp_config *configs, + struct dhcp_context *context, + unsigned char *clid, int clid_len, |