Merge tag 'upstream/1.2.3'

[quagga-debian.git] / bgpd / bgp_open.c

diff --git a/bgpd/bgp_open.c b/bgpd/bgp_open.c
index 280042306f303d4477b0a3f4e571be22a01fac91..d9ec4bef8ec0a9b8bc65679fdc05079487a6fbf7 100644 (file)
--- a/bgpd/bgp_open.c
+++ b/bgpd/bgp_open.c
@@ -120,7 +120,8 @@ bgp_capability_vty_out (struct vty *vty, struct peer *peer)
 static void 
 bgp_capability_mp_data (struct stream *s, struct capability_mp_data *mpc)
 {
-  mpc->afi = stream_getw (s);
+  afi_t afi = stream_getw (s);
+  memcpy(&mpc->afi, &afi, sizeof(mpc->afi));
   mpc->reserved = stream_getc (s);
   mpc->safi = stream_getc (s);
 }