zebra, lib: fix the ZEBRA_INTERFACE_VRF_UPDATE zapi message

[mirror_frr.git] / ospf6d / ospf6_proto.c

diff --git a/ospf6d/ospf6_proto.c b/ospf6d/ospf6_proto.c
index c792aa4526136b8e79d5460cae5d785159a18465..864974c9a4c3d952723a1a9a6dede2e786c685ab 100644 (file)
--- a/ospf6d/ospf6_proto.c
+++ b/ospf6d/ospf6_proto.c
@@ -13,10 +13,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with GNU Zebra; see the file COPYING.  If not, write to the 
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
- * Boston, MA 02111-1307, USA.  
+ * You should have received a copy of the GNU General Public License along
+ * with this program; see the file COPYING; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -25,61 +24,63 @@
 
 #include "ospf6_proto.h"
 
-void
-ospf6_prefix_apply_mask (struct ospf6_prefix *op)
+void ospf6_prefix_in6_addr(struct in6_addr *in6, const void *prefix_buf,
+                          const struct ospf6_prefix *p)
 {
-  u_char *pnt, mask;
-  int index, offset;
+       ptrdiff_t in6_off = (caddr_t)p->addr - (caddr_t)prefix_buf;
 
-  pnt = (u_char *)((caddr_t) op + sizeof (struct ospf6_prefix));
-  index = op->prefix_length / 8;
-  offset = op->prefix_length % 8;
-  mask = 0xff << (8 - offset);
+       memset(in6, 0, sizeof(struct in6_addr));
+       memcpy(in6, (uint8_t *)prefix_buf + in6_off,
+              OSPF6_PREFIX_SPACE(p->prefix_length));
+}
+
+void ospf6_prefix_apply_mask(struct ospf6_prefix *op)
+{
+       uint8_t *pnt, mask;
+       int index, offset;
 
-  if (index > 16)
-    {
-      zlog_warn ("Prefix length too long: %d", op->prefix_length);
-      return;
-    }
+       pnt = (uint8_t *)((caddr_t)op + sizeof(struct ospf6_prefix));
+       index = op->prefix_length / 8;
+       offset = op->prefix_length % 8;
+       mask = 0xff << (8 - offset);
 
-  if (index == 16)
-    return;
+       if (index > 16) {
+               zlog_warn("Prefix length too long: %d", op->prefix_length);
+               return;
+       }
 
-  pnt[index] &= mask;
-  index ++;
+       /* nonzero mask means no check for this byte because if it contains
+        * prefix bits it must be there for us to write */
+       if (mask)
+               pnt[index++] &= mask;
 
-  while (index < OSPF6_PREFIX_SPACE (op->prefix_length))
-    pnt[index++] = 0;
+       while (index < OSPF6_PREFIX_SPACE(op->prefix_length))
+               pnt[index++] = 0;
 }
 
-void
-ospf6_prefix_options_printbuf (u_int8_t prefix_options, char *buf, int size)
+void ospf6_prefix_options_printbuf(uint8_t prefix_options, char *buf, int size)
 {
-  snprintf (buf, size, "xxx");
+       snprintf(buf, size, "xxx");
 }
 
-void
-ospf6_capability_printbuf (char capability, char *buf, int size)
+void ospf6_capability_printbuf(char capability, char *buf, int size)
 {
-  char w, v, e, b;
-  w = (capability & OSPF6_ROUTER_BIT_W ? 'W' : '-');
-  v = (capability & OSPF6_ROUTER_BIT_V ? 'V' : '-');
-  e = (capability & OSPF6_ROUTER_BIT_E ? 'E' : '-');
-  b = (capability & OSPF6_ROUTER_BIT_B ? 'B' : '-');
-  snprintf (buf, size, "----%c%c%c%c", w, v, e, b);
+       char w, v, e, b;
+       w = (capability & OSPF6_ROUTER_BIT_W ? 'W' : '-');
+       v = (capability & OSPF6_ROUTER_BIT_V ? 'V' : '-');
+       e = (capability & OSPF6_ROUTER_BIT_E ? 'E' : '-');
+       b = (capability & OSPF6_ROUTER_BIT_B ? 'B' : '-');
+       snprintf(buf, size, "----%c%c%c%c", w, v, e, b);
 }
 
-void
-ospf6_options_printbuf (u_char *options, char *buf, int size)
+void ospf6_options_printbuf(uint8_t *options, char *buf, int size)
 {
-  const char *dc, *r, *n, *mc, *e, *v6;
-  dc = (OSPF6_OPT_ISSET (options, OSPF6_OPT_DC) ? "DC" : "--");
-  r  = (OSPF6_OPT_ISSET (options, OSPF6_OPT_R)  ? "R"  : "-" );
-  n  = (OSPF6_OPT_ISSET (options, OSPF6_OPT_N)  ? "N"  : "-" );
-  mc = (OSPF6_OPT_ISSET (options, OSPF6_OPT_MC) ? "MC" : "--");
-  e  = (OSPF6_OPT_ISSET (options, OSPF6_OPT_E)  ? "E"  : "-" );
-  v6 = (OSPF6_OPT_ISSET (options, OSPF6_OPT_V6) ? "V6" : "--");
-  snprintf (buf, size, "%s|%s|%s|%s|%s|%s", dc, r, n, mc, e, v6);
+       const char *dc, *r, *n, *mc, *e, *v6;
+       dc = (OSPF6_OPT_ISSET(options, OSPF6_OPT_DC) ? "DC" : "--");
+       r = (OSPF6_OPT_ISSET(options, OSPF6_OPT_R) ? "R" : "-");
+       n = (OSPF6_OPT_ISSET(options, OSPF6_OPT_N) ? "N" : "-");
+       mc = (OSPF6_OPT_ISSET(options, OSPF6_OPT_MC) ? "MC" : "--");
+       e = (OSPF6_OPT_ISSET(options, OSPF6_OPT_E) ? "E" : "-");
+       v6 = (OSPF6_OPT_ISSET(options, OSPF6_OPT_V6) ? "V6" : "--");
+       snprintf(buf, size, "%s|%s|%s|%s|%s|%s", dc, r, n, mc, e, v6);
 }
-
-