Wireguard: Add peer config settings

2 files changed, 43 insertions, 1 deletions

diff --git a/proto/wireguard/config.Y b/proto/wireguard/config.Y
index 2eee7e72..9a414085 100644
--- a/proto/wireguard/config.Y
+++ b/proto/wireguard/config.Y
@@ -16,7 +16,7 @@ CF_DEFINES
 
 CF_DECLS
 
-CF_KEYWORDS(WIREGUARD)
+CF_KEYWORDS(WIREGUARD, PUBKEY, ENDPOINT, ALLOWED_IPS)
 
 CF_GRAMMAR
 
@@ -32,6 +32,41 @@ wireguard_proto:
  | wireguard_proto wg_proto_channel ';'
  | wireguard_proto proto_item ';'
  | wireguard_proto INTERFACE TEXT ';' { WG_CFG->ifname = $3; }
+ | wireguard_proto wg_peer ';'
+ ;
+
+wg_peer: wg_peer_start wg_peer_opt_list wg_peer_end;
+
+wg_peer_start: PEER
+
+wg_peer_end:
+ ;
+
+wg_peer_item:
+   PUBKEY pubkey
+ | ENDPOINT endpoint
+ | PORT port
+ | ALLOWED_IPS allowed_ips
+ ;
+
+wg_peer_opts:
+  /* empty */
+ | wg_peer_opts wg_peer_item ';'
+ ;
+
+wg_peer_opt_list:
+  /* empty */
+ | '{' wg_peer_opts '}'
+ ;
+
+pubkey: text { WG_CFG->peer.pubkey = $1; }
+
+endpoint: ipa { WG_CFG->peer.endpoint = $1; }
+
+port: expr { WG_CFG->peer.remote_port = $1; }
+
+allowed_ips:
+   net_or_ipa { WG_CFG->peer.allowed_ips = $1; }
  ;
 
 wg_proto_channel: wg_channel_start channel_opt_list wg_channel_end;
diff --git a/proto/wireguard/wireguard.h b/proto/wireguard/wireguard.h
index 3217df32..1292b1c0 100644
--- a/proto/wireguard/wireguard.h
+++ b/proto/wireguard/wireguard.h
@@ -6,6 +6,13 @@
 struct wg_config {
   struct proto_config c;
   const char *ifname;
+
+  struct peer {
+    const char *pubkey;
+    ip_addr endpoint;
+    u16 remote_port;
+    struct net_addr allowed_ips;
+  } peer;
 };
 
 struct wg_proto {