X-Git-Url: http://git.samba.org/samba.git/?p=obnox%2Fwireshark%2Fwip.git;a=blobdiff_plain;f=wiretap%2Feyesdn.c;h=897e32e32924269eb46d98c1a1b629109ce4f930;hp=534f72274cf8fd45799c4bdf17e97ea150024d23;hb=f27aa83c5d449e58989cdba52f827792e22d7799;hpb=e3a174e55ee8ecfb5cc8dc86ad3a98420e1fae2d

diff --git a/wiretap/eyesdn.c b/wiretap/eyesdn.c
index 534f72274c..897e32e329 100644
--- a/wiretap/eyesdn.c
+++ b/wiretap/eyesdn.c
@@ -41,7 +41,7 @@
  * 7-n Byte: Frames
  * 
  * Each Frame starts with the 0xff Flag byte
- * - Bytes 0-2: timestamp (long usec in network byte order)
+ * - Bytes 0-2: timestamp (usec in network byte order)
  * - Bytes 3-7: timestamp (40bits sec since 1970 in network byte order)
  * - Byte 8: channel (0 for D channel, 1-30 for B1-B30)
  * - Byte 9: Sender Bit 0(0 NT, 1 TE), Protocol in Bits 7:1, see enum
@@ -57,37 +57,28 @@
  */
 
 
-static int esc_read(guint8 *buf, int len, FILE_T fh, int seekback)
+static int esc_read(guint8 *buf, int len, FILE_T fh)
 {
-    int i;
-    int value;
-    gint64 cur_off;
-    int err;
-
-    if(seekback) cur_off = file_tell(fh);
-    else cur_off=0; /* suppress uninitialized warning */
-    
-    for(i=0; i<len; i++) {
-	value=file_getc(fh);
-	if(value==-1)
-	    return -2; /* EOF or error */
-	if(value==0xff)
-	    return -1; /* error !!, read into next frame */
-	if(value==0xfe) {
-	    /* we need to escape */
-	    value=file_getc(fh);
-	    if(value==-1)
-		return -2;
-	    value+=2;
+	int i;
+	int value;
+
+	for(i=0; i<len; i++) {
+		value=file_getc(fh);
+		if(value==-1)
+			return -2; /* EOF or error */
+		if(value==0xff)
+			return -1; /* error !!, read into next frame */
+		if(value==0xfe) {
+			/* we need to escape */
+			value=file_getc(fh);
+			if(value==-1)
+				return -2;
+			value+=2;
+		}
+		buf[i]=value;
 	}
-	buf[i]=value;
-    }
-
-    if(seekback) {
-	if (file_seek(fh, cur_off, SEEK_SET, &err) == -1)
-	    return err<0?err:-err;
-    }
-    return i;
+
+	return i;
 }
 
 /* Magic text to check for eyesdn-ness of file */
@@ -114,44 +105,44 @@ static int parse_eyesdn_rec_hdr(wtap *wth, FILE_T fh,
 	union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info);
 
 /* Seeks to the beginning of the next packet, and returns the
-   byte offset.  Returns -1 on failure, and sets "*err" to the error. */
-static gint64 eyesdn_seek_next_packet(wtap *wth, int *err)
+   byte offset.  Returns -1 on failure, and sets "*err" to the error
+   and "*err_info" to null or an additional error string. */
+static gint64 eyesdn_seek_next_packet(wtap *wth, int *err, gchar **err_info)
 {
-  int byte;
-  gint64 cur_off;
-
-  while ((byte = file_getc(wth->fh)) != EOF) {
-    if (byte == 0xff) {
-        cur_off = file_tell(wth->fh);
-        if (cur_off == -1) {
-          /* Error. */
-          *err = file_error(wth->fh);
-          return -1;
-        }
-        return cur_off;
-      }
-  }
-  if (file_eof(wth->fh)) {
-    /* We got an EOF. */
-    *err = 0;
-  } else {
-    /* We (presumably) got an error (there's no equivalent to "ferror()"
-       in zlib, alas, so we don't have a wrapper to check for an error). */
-    *err = file_error(wth->fh);
-  }
-  return -1;
+	int byte;
+	gint64 cur_off;
+
+	while ((byte = file_getc(wth->fh)) != EOF) {
+		if (byte == 0xff) {
+			cur_off = file_tell(wth->fh);
+			if (cur_off == -1) {
+				/* Error. */
+				*err = file_error(wth->fh, err_info);
+				return -1;
+			}
+			return cur_off;
+		}
+	}
+	if (file_eof(wth->fh)) {
+		/* We got an EOF. */
+		*err = 0;
+	} else {
+		/* We got an error. */
+		*err = file_error(wth->fh, err_info);
+	}
+	return -1;
 }
 
-int eyesdn_open(wtap *wth, int *err, gchar **err_info _U_)
+int eyesdn_open(wtap *wth, int *err, gchar **err_info)
 {
 	int	bytes_read;
 	char	magic[EYESDN_HDR_MAGIC_SIZE];
 
 	/* Look for eyesdn header */
 	errno = WTAP_ERR_CANT_READ;
-	bytes_read = file_read(&magic, 1, sizeof magic, wth->fh);
+	bytes_read = file_read(&magic, sizeof magic, wth->fh);
 	if (bytes_read != sizeof magic) {
-		*err = file_error(wth->fh);
+		*err = file_error(wth->fh, err_info);
 		if (*err != 0)
 			return -1;
 		return 0;
@@ -179,7 +170,7 @@ static gboolean eyesdn_read(wtap *wth, int *err, gchar **err_info,
 	int	pkt_len;
 
 	/* Find the next packet */
-	offset = eyesdn_seek_next_packet(wth, err);
+	offset = eyesdn_seek_next_packet(wth, err, err_info);
 	if (offset < 1)
 		return FALSE;
 
@@ -218,7 +209,7 @@ eyesdn_seek_read (wtap *wth, gint64 seek_off,
 
 	if (pkt_len != len) {
 		if (pkt_len != -1) {
-			*err = WTAP_ERR_BAD_RECORD;
+			*err = WTAP_ERR_BAD_FILE;
 			*err_info = g_strdup_printf("eyesdn: requested length %d doesn't match length %d",
 			    len, pkt_len);
 		}
@@ -235,7 +226,8 @@ parse_eyesdn_rec_hdr(wtap *wth, FILE_T fh,
     union wtap_pseudo_header *pseudo_header, int *err, gchar **err_info)
 {
 	guint8		hdr[EYESDN_HDR_LENGTH];
-        unsigned long   secs, usecs;
+	time_t		secs;
+	int		usecs;
 	int		pkt_len;
 	guint8		channel, direction;
 
@@ -243,108 +235,140 @@ parse_eyesdn_rec_hdr(wtap *wth, FILE_T fh,
 	 * for a packet. Read in that header and extract the useful
 	 * information.
 	 */
-	if (esc_read(hdr, EYESDN_HDR_LENGTH, fh, 0) != EYESDN_HDR_LENGTH) {
-		*err = file_error(fh);
+	if (esc_read(hdr, EYESDN_HDR_LENGTH, fh) != EYESDN_HDR_LENGTH) {
+		*err = file_error(fh, err_info);
 		if (*err == 0)
 			*err = WTAP_ERR_SHORT_READ;
 		return -1;
 	}
     
         /* extract information from header */
-        usecs = ((unsigned long) hdr[0]);
-        usecs = (usecs << 8) | ((unsigned long) hdr[1]);
-        usecs = (usecs << 8) | ((unsigned long) hdr[2]);
+        usecs = pntoh24(&hdr[0]);
 #ifdef TV64BITS    
-        secs = ((unsigned long) hdr[3]);
+        secs = hdr[3];
 #else    
         secs = 0;
 #endif    
-        secs = (secs << 8) | ((unsigned long) hdr[4]);
-        secs = (secs << 8) | ((unsigned long) hdr[5]);
-        secs = (secs << 8) | ((unsigned long) hdr[6]);
-        secs = (secs << 8) | ((unsigned long) hdr[7]);
+        secs = (secs << 8) | hdr[4];
+        secs = (secs << 8) | hdr[5];
+        secs = (secs << 8) | hdr[6];
+        secs = (secs << 8) | hdr[7];
 
         channel = hdr[8];
         direction = hdr[9];
-        pkt_len = ((unsigned long) hdr[10]);
-        pkt_len = (pkt_len << 8) | ((unsigned long) hdr[11]);
+        pkt_len = pntohs(&hdr[10]);
 
 	switch(direction >> 1) {
+
 	default:
 	case EYESDN_ENCAP_ISDN: /* ISDN */
-	    pseudo_header->isdn.uton = direction & 1;
-	    pseudo_header->isdn.channel = channel;
-	    if(channel) { /* bearer channels */
-		if(wth) {
-		    wth->phdr.pkt_encap = WTAP_ENCAP_ISDN; /* recognises PPP */
-		    pseudo_header->isdn.uton=!pseudo_header->isdn.uton; /* bug */
+		pseudo_header->isdn.uton = direction & 1;
+		pseudo_header->isdn.channel = channel;
+		if(channel) { /* bearer channels */
+			if(wth) {
+				wth->phdr.pkt_encap = WTAP_ENCAP_ISDN; /* recognises PPP */
+				pseudo_header->isdn.uton=!pseudo_header->isdn.uton; /* bug */
+			}
+		} else { /* D channel */
+			if(wth) {
+				wth->phdr.pkt_encap = WTAP_ENCAP_ISDN;
+			}
 		}
-	    } else { /* D channel */
+		break;
+
+	case EYESDN_ENCAP_MSG: /* Layer 1 message */
 		if(wth) {
-		    wth->phdr.pkt_encap = WTAP_ENCAP_ISDN;
+			wth->phdr.pkt_encap = WTAP_ENCAP_LAYER1_EVENT;
 		}
-	    }
-	    break;
-	case EYESDN_ENCAP_MSG: /* Layer 1 message */
-	    if(wth) {
-		wth->phdr.pkt_encap = WTAP_ENCAP_LAYER1_EVENT;
-	    }
-	    pseudo_header->l1event.uton = (direction & 1);
-	    break;
+		pseudo_header->l1event.uton = (direction & 1);
+		break;
+
 	case EYESDN_ENCAP_LAPB: /* X.25 via LAPB */ 
-	    if(wth) {
-		wth->phdr.pkt_encap = WTAP_ENCAP_LAPB;
-	    }
-	    pseudo_header->x25.flags = (direction & 1) ? 0 : 0x80;
-	    break;
+		if(wth) {
+			wth->phdr.pkt_encap = WTAP_ENCAP_LAPB;
+		}
+		pseudo_header->x25.flags = (direction & 1) ? 0 : 0x80;
+		break;
+
 	case EYESDN_ENCAP_ATM: { /* ATM cells */
 #define CELL_LEN 53
-	    unsigned char cell[CELL_LEN];
-	    if(pkt_len != CELL_LEN) {
-		*err = WTAP_ERR_BAD_RECORD;
-		*err_info = g_strdup_printf("eyesdn: ATM cell has a length "
-					    "!= 53 (%u)", pkt_len);
-		return -1;
-	    }
+		unsigned char cell[CELL_LEN];
+		gint64 cur_off;
+
+		if(pkt_len != CELL_LEN) {
+			*err = WTAP_ERR_BAD_FILE;
+			*err_info = g_strdup_printf(
+			    "eyesdn: ATM cell has a length != 53 (%u)",
+			    pkt_len);
+			return -1;
+		}
+
+		cur_off = file_tell(fh);
+		if (esc_read(cell, CELL_LEN, fh) != CELL_LEN) {
+			*err = file_error(fh, err_info);
+			if (*err == 0)
+				*err = WTAP_ERR_SHORT_READ;
+			return -1;
+		}
+		if (file_seek(fh, cur_off, SEEK_SET, err) == -1)
+			return -1;
+		if(wth) {
+			wth->phdr.pkt_encap = WTAP_ENCAP_ATM_PDUS_UNTRUNCATED;
+		}
+		pseudo_header->atm.flags=ATM_RAW_CELL;
+		pseudo_header->atm.aal=AAL_UNKNOWN;
+		pseudo_header->atm.type=TRAF_UMTS_FP;
+		pseudo_header->atm.subtype=TRAF_ST_UNKNOWN;
+		pseudo_header->atm.vpi=((cell[0]&0xf)<<4) + (cell[0]&0xf);
+		pseudo_header->atm.vci=((cell[0]&0xf)<<4) + cell[0]; /* from cell */
+		pseudo_header->atm.channel=direction & 1;
+		}
+		break;
 
-	    if (esc_read(cell, CELL_LEN, fh, 1) != CELL_LEN) {
-		*err = file_error(fh);
-		if (*err == 0)
-		    *err = WTAP_ERR_SHORT_READ;
-		return -1;
-	    }
-
-	    if(wth) {
-		wth->phdr.pkt_encap = WTAP_ENCAP_ATM_PDUS_UNTRUNCATED;
-	    }
-	    pseudo_header->atm.flags=ATM_RAW_CELL;
-	    pseudo_header->atm.aal=AAL_UNKNOWN;
-	    pseudo_header->atm.type=TRAF_UMTS_FP;
-	    pseudo_header->atm.subtype=TRAF_ST_UNKNOWN;
-	    pseudo_header->atm.vpi=((cell[0]&0xf)<<4) + (cell[0]&0xf);
-	    pseudo_header->atm.vci=((cell[0]&0xf)<<4) + cell[0]; /* from cell */
-	    pseudo_header->atm.channel=direction & 1;
-	}
-	    break;
 	case EYESDN_ENCAP_MTP2: /* SS7 frames */
-	    pseudo_header->mtp2.sent = direction & 1;
-	    pseudo_header->mtp2.annex_a_used = MTP2_ANNEX_A_USED_UNKNOWN;
-	    pseudo_header->mtp2.link_number = channel;	    
-	    if(wth) {
-		wth->phdr.pkt_encap = WTAP_ENCAP_MTP2;
-	    }
-	    break;
-	} 
-
-        if(pkt_len > EYESDN_MAX_PACKET_LEN) {
-	    *err = WTAP_ERR_BAD_RECORD;
-	    *err_info = g_strdup_printf("eyesdn: File has %u-byte packet, bigger than maximum of %u",
+		pseudo_header->mtp2.sent = direction & 1;
+		pseudo_header->mtp2.annex_a_used = MTP2_ANNEX_A_USED_UNKNOWN;
+		pseudo_header->mtp2.link_number = channel;		
+		if(wth) {
+			wth->phdr.pkt_encap = WTAP_ENCAP_MTP2;
+		}
+		break;
+
+	case EYESDN_ENCAP_DPNSS: /* DPNSS */
+		pseudo_header->isdn.uton = direction & 1;
+		pseudo_header->isdn.channel = channel;
+		if(wth) {
+			wth->phdr.pkt_encap = WTAP_ENCAP_DPNSS;
+		}
+		break;
+
+	case EYESDN_ENCAP_DASS2: /* DASS2 frames */
+		pseudo_header->isdn.uton = direction & 1;
+		pseudo_header->isdn.channel = channel;
+		if(wth) {
+			wth->phdr.pkt_encap = WTAP_ENCAP_DPNSS;
+		}
+		break;
+
+	case EYESDN_ENCAP_BACNET: /* BACNET async over HDLC frames */
+		/* pseudo_header->isdn.uton = direction & 1; */
+		/* pseudo_header->isdn.channel = channel; */
+		if(wth) {
+			wth->phdr.pkt_encap = WTAP_ENCAP_BACNET_MS_TP;
+		}
+		break;
+	}
+
+	if(pkt_len > EYESDN_MAX_PACKET_LEN) {
+		*err = WTAP_ERR_BAD_FILE;
+		*err_info = g_strdup_printf("eyesdn: File has %u-byte packet, bigger than maximum of %u",
 		pkt_len, EYESDN_MAX_PACKET_LEN);
-	    return -1;
+		return -1;
 	}
 
 	if (wth) {
-	        wth->phdr.ts.secs = secs;
+		wth->phdr.presence_flags = WTAP_HAS_TS;
+		wth->phdr.ts.secs = secs;
 		wth->phdr.ts.nsecs = usecs * 1000;
 		wth->phdr.caplen = pkt_len;
 		wth->phdr.len = pkt_len;
@@ -361,18 +385,164 @@ parse_eyesdn_packet_data(FILE_T fh, int pkt_len, guint8* buf, int *err,
         int bytes_read;
 
 	errno = WTAP_ERR_CANT_READ;
-	bytes_read = esc_read(buf, pkt_len, fh, 0);
+	bytes_read = esc_read(buf, pkt_len, fh);
 	if (bytes_read != pkt_len) {
-	    if (bytes_read == -2) {
-		*err = file_error(fh);
-		if (*err == 0)
-		    *err = WTAP_ERR_SHORT_READ;
-	    }  else if (bytes_read == -1) {
-	        *err = WTAP_ERR_BAD_RECORD;
-	        *err_info = g_strdup("eyesdn: No flag character seen in frame");
-	    } else
-		*err = WTAP_ERR_SHORT_READ;
-	    return FALSE;
+		if (bytes_read == -2) {
+			*err = file_error(fh, err_info);
+			if (*err == 0)
+				*err = WTAP_ERR_SHORT_READ;
+		} else if (bytes_read == -1) {
+			*err = WTAP_ERR_BAD_FILE;
+			*err_info = g_strdup("eyesdn: No flag character seen in frame");
+		} else
+			*err = WTAP_ERR_SHORT_READ;
+		return FALSE;
 	}
 	return TRUE;
 }
+
+
+static gboolean
+esc_write(wtap_dumper *wdh, const guint8 *buf, int len, int *err)
+{
+	int i;
+	guint8 byte;
+	static const guint8 esc = 0xfe;
+	
+	for(i=0; i<len; i++) {
+		byte=buf[i];
+		if(byte == 0xff || byte == 0xfe) {
+			/*
+			 * Escape the frame delimiter and escape byte.
+			 */
+			if (!wtap_dump_file_write(wdh, &esc, sizeof esc, err))
+				return FALSE;
+			byte-=2;
+		}
+		if (!wtap_dump_file_write(wdh, &byte, sizeof byte, err))
+			return FALSE;
+	}
+	return TRUE;
+}
+
+static gboolean eyesdn_dump(wtap_dumper *wdh,
+			    const struct wtap_pkthdr *phdr,
+			    const union wtap_pseudo_header *pseudo_header _U_,
+			    const guint8 *pd, int *err);
+
+gboolean eyesdn_dump_open(wtap_dumper *wdh, int *err)
+{
+	wdh->subtype_write=eyesdn_dump;
+	wdh->subtype_close=NULL;
+
+	if (!wtap_dump_file_write(wdh, eyesdn_hdr_magic,
+	    EYESDN_HDR_MAGIC_SIZE, err))
+		return FALSE;
+	wdh->bytes_dumped += EYESDN_HDR_MAGIC_SIZE;
+	*err=0;
+	return TRUE;
+}
+
+int eyesdn_dump_can_write_encap(int encap)
+{
+	switch (encap) {
+	case WTAP_ENCAP_ISDN:
+	case WTAP_ENCAP_LAYER1_EVENT:
+	case WTAP_ENCAP_DPNSS:
+	case WTAP_ENCAP_ATM_PDUS_UNTRUNCATED:
+	case WTAP_ENCAP_LAPB:
+	case WTAP_ENCAP_MTP2:
+	case WTAP_ENCAP_BACNET_MS_TP:
+	case WTAP_ENCAP_PER_PACKET:
+		return 0;
+
+	default:
+		return WTAP_ERR_UNSUPPORTED_ENCAP;
+	}
+}
+
+/* Write a record for a packet to a dump file.
+ *    Returns TRUE on success, FALSE on failure. */
+static gboolean eyesdn_dump(wtap_dumper *wdh,
+			    const struct wtap_pkthdr *phdr,
+			    const union wtap_pseudo_header *pseudo_header _U_,
+			    const guint8 *pd, int *err)
+{
+	static const guint8 start_flag = 0xff;
+	guint8 buf[EYESDN_HDR_LENGTH];
+	int usecs;
+	time_t secs;
+	int channel;
+	int origin;
+	int protocol;
+	int size;
+
+	usecs=phdr->ts.nsecs/1000;
+	secs=phdr->ts.secs;
+	size=phdr->caplen;
+	origin = pseudo_header->isdn.uton;
+	channel = pseudo_header->isdn.channel;
+
+	switch(phdr->pkt_encap) {
+
+	case WTAP_ENCAP_ISDN:
+		protocol=EYESDN_ENCAP_ISDN; /* set depending on decoder format and mode */
+		break;
+
+	case WTAP_ENCAP_LAYER1_EVENT:
+		protocol=EYESDN_ENCAP_MSG;
+		break;
+
+	case WTAP_ENCAP_DPNSS:
+		protocol=EYESDN_ENCAP_DPNSS;
+		break;
+
+#if 0
+	case WTAP_ENCAP_DASS2:
+		protocol=EYESDN_ENCAP_DASS2;
+		break;
+#endif
+
+	case WTAP_ENCAP_ATM_PDUS_UNTRUNCATED:
+		protocol=EYESDN_ENCAP_ATM;
+		channel=0x80;
+		break;
+
+	case WTAP_ENCAP_LAPB:
+		protocol=EYESDN_ENCAP_LAPB;
+		break;
+
+	case WTAP_ENCAP_MTP2:
+		protocol=EYESDN_ENCAP_MTP2;
+		break;
+
+	case WTAP_ENCAP_BACNET_MS_TP:
+		protocol=EYESDN_ENCAP_BACNET;
+		break;
+
+	default:
+		*err=WTAP_ERR_UNSUPPORTED_ENCAP;
+		return FALSE;
+	}
+
+	phton24(&buf[0], usecs);
+
+	buf[3] = (guint8)0;
+	buf[4] = (guint8)(0xff & (secs >> 24));
+	buf[5] = (guint8)(0xff & (secs >> 16));
+	buf[6] = (guint8)(0xff & (secs >> 8));
+	buf[7] = (guint8)(0xff & (secs >> 0));
+
+	buf[8] = (guint8) channel;
+	buf[9] = (guint8) (origin?1:0) + (protocol << 1);
+	phtons(&buf[10], size);
+	
+	/* start flag */
+	if (!wtap_dump_file_write(wdh, &start_flag, sizeof start_flag, err))
+		return FALSE;
+	if (!esc_write(wdh, buf, 12, err))
+		return FALSE;
+	if (!esc_write(wdh, pd, size, err))
+		return FALSE;
+	return TRUE;
+}