summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2017-04-04 15:50:30 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2017-04-04 15:50:30 +0000
commitb95aa85ce90bda623d048d8dadbebf256f157214 (patch)
tree035ee17d2ba375c6a68787b7bc445f72b6019c5e
parentfaf58e0a0d1387d3cdf857e547de5b78647774c2 (diff)
constify pc_remote and pc_circuit
OK rzalamena@
-rw-r--r--usr.sbin/dhcrelay/dhcpd.h6
-rw-r--r--usr.sbin/dhcrelay/dhcrelay.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/dhcrelay/dhcpd.h b/usr.sbin/dhcrelay/dhcpd.h
index ca690e37eee..239f6053b04 100644
--- a/usr.sbin/dhcrelay/dhcpd.h
+++ b/usr.sbin/dhcrelay/dhcpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhcpd.h,v 1.21 2017/03/16 09:17:20 rzalamena Exp $ */
+/* $OpenBSD: dhcpd.h,v 1.22 2017/04/04 15:50:29 reyk Exp $ */
/*
* Copyright (c) 2004 Henning Brauer <henning@openbsd.org>
@@ -56,9 +56,9 @@ struct packet_ctx {
struct sockaddr_storage pc_src;
struct sockaddr_storage pc_dst;
- u_int8_t *pc_circuit;
+ const char *pc_circuit;
int pc_circuitlen;
- u_int8_t *pc_remote;
+ const char *pc_remote;
int pc_remotelen;
};
diff --git a/usr.sbin/dhcrelay/dhcrelay.c b/usr.sbin/dhcrelay/dhcrelay.c
index bc2d7d7ddb0..161d289ad1d 100644
--- a/usr.sbin/dhcrelay/dhcrelay.c
+++ b/usr.sbin/dhcrelay/dhcrelay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dhcrelay.c,v 1.61 2017/03/16 09:17:20 rzalamena Exp $ */
+/* $OpenBSD: dhcrelay.c,v 1.62 2017/04/04 15:50:29 reyk Exp $ */
/*
* Copyright (c) 2004 Henning Brauer <henning@cvs.openbsd.org>
@@ -567,7 +567,7 @@ relay_agentinfo(struct packet_ctx *pc, struct interface_info *intf,
return;
if (rai_remote != NULL) {
- pc->pc_remote = (u_int8_t *)rai_remote;
+ pc->pc_remote = rai_remote;
pc->pc_remotelen = strlen(rai_remote);
} else
pc->pc_remotelen = 0;
@@ -590,7 +590,7 @@ relay_agentinfo(struct packet_ctx *pc, struct interface_info *intf,
sizeof(sin->sin_addr);
}
} else {
- pc->pc_circuit = (u_int8_t *)rai_circuit;
+ pc->pc_circuit = rai_circuit;
pc->pc_circuitlen = strlen(rai_circuit);
}
}