[BACK]Return to isis_dlpi.c CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / quagga / isisd

Diff for /embedaddon/quagga/isisd/isis_dlpi.c between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/21 17:26:11 version 1.1.1.2, 2012/10/09 09:22:28
Line 442  open_dlpi_dev (struct isis_circuit *circuit) Line 442  open_dlpi_dev (struct isis_circuit *circuit)
    * 8.4.2 - Broadcast subnetwork IIH PDUs     * 8.4.2 - Broadcast subnetwork IIH PDUs
    */     */
   retval = 0;    retval = 0;
  if (circuit->circuit_is_type & IS_LEVEL_1)  if (circuit->is_type & IS_LEVEL_1)
     {      {
       retval |= dlpimcast (fd, ALL_L1_ISS);        retval |= dlpimcast (fd, ALL_L1_ISS);
       retval |= dlpimcast (fd, ALL_ISS);        retval |= dlpimcast (fd, ALL_ISS);
     }      }
  if (circuit->circuit_is_type & IS_LEVEL_2)  if (circuit->is_type & IS_LEVEL_2)
     retval |= dlpimcast (fd, ALL_L2_ISS);      retval |= dlpimcast (fd, ALL_L2_ISS);
   
   if (retval != 0)    if (retval != 0)
Line 589  isis_send_pdu_bcast (struct isis_circuit *circuit, int Line 589  isis_send_pdu_bcast (struct isis_circuit *circuit, int
   dl_unitdata_req_t *dur = (dl_unitdata_req_t *)dlpi_ctl;    dl_unitdata_req_t *dur = (dl_unitdata_req_t *)dlpi_ctl;
   char *dstaddr;    char *dstaddr;
   u_short *dstsap;    u_short *dstsap;
     int buflen;
   
     buflen = stream_get_endp (circuit->snd_stream) + LLC_LEN;
     if (buflen > sizeof (sock_buff))
       {
         zlog_warn ("isis_send_pdu_bcast: sock_buff size %lu is less than "
                    "output pdu size %d on circuit %s",
                    sizeof (sock_buff), buflen, circuit->interface->name);
         return ISIS_WARNING;
       }
   
   stream_set_getp (circuit->snd_stream, 0);    stream_set_getp (circuit->snd_stream, 0);
   
   memset (dur, 0, sizeof (*dur));    memset (dur, 0, sizeof (*dur));
Line 612  isis_send_pdu_bcast (struct isis_circuit *circuit, int Line 622  isis_send_pdu_bcast (struct isis_circuit *circuit, int
   else    else
     memcpy (dstaddr, ALL_L2_ISS, ETHERADDRL);      memcpy (dstaddr, ALL_L2_ISS, ETHERADDRL);
   /* Note: DLPI SAP values are in host byte order */    /* Note: DLPI SAP values are in host byte order */
  *dstsap = stream_get_endp (circuit->snd_stream) + LLC_LEN;  *dstsap = buflen;
   
   sock_buff[0] = ISO_SAP;    sock_buff[0] = ISO_SAP;
   sock_buff[1] = ISO_SAP;    sock_buff[1] = ISO_SAP;
Line 620  isis_send_pdu_bcast (struct isis_circuit *circuit, int Line 630  isis_send_pdu_bcast (struct isis_circuit *circuit, int
   memcpy (sock_buff + LLC_LEN, circuit->snd_stream->data,    memcpy (sock_buff + LLC_LEN, circuit->snd_stream->data,
           stream_get_endp (circuit->snd_stream));            stream_get_endp (circuit->snd_stream));
   dlpisend (circuit->fd, dur, sizeof (*dur) + dur->dl_dest_addr_length,    dlpisend (circuit->fd, dur, sizeof (*dur) + dur->dl_dest_addr_length,
    sock_buff, stream_get_endp (circuit->snd_stream) + LLC_LEN, 0);            sock_buff, buflen, 0);
   return ISIS_OK;    return ISIS_OK;
 }  }
   
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>