Rename TranslateIPToPcapDev to PcapTranslateIPToDevice and make the length argument size_t.

remotes/origin/master-1.0.x
Victor Julien 16 years ago
parent 55d0d1e7a1
commit 2910759943

@ -431,7 +431,7 @@ TmEcode DecodePcapThreadInit(ThreadVars *tv, void *initdata, void **data)
SCReturnInt(TM_ECODE_OK);
}
void TranslateIPToPcapDev(char *pcap_dev, int len)
void PcapTranslateIPToDevice(char *pcap_dev, size_t len)
{
char errbuf[PCAP_ERRBUF_SIZE];
pcap_if_t *alldevsp = NULL;
@ -479,7 +479,7 @@ void TranslateIPToPcapDev(char *pcap_dev, int len)
freeaddrinfo(aiList);
memset(pcap_dev, 0, len);
strncpy(pcap_dev, devsp->name, ((strlen(devsp->name) < len) ? (strlen(devsp->name)) : (len-1)));
strlcpy(pcap_dev, devsp->name, ((strlen(devsp->name) < len) ? (strlen(devsp->name)) : (len-1)));
pcap_freealldevs(alldevsp);
return;

@ -26,7 +26,7 @@
void TmModuleReceivePcapRegister (void);
void TmModuleDecodePcapRegister (void);
void TranslateIPToPcapDev(char *pcap_dev, int len);
void PcapTranslateIPToDevice(char *pcap_dev, size_t len);
/* XXX replace with user configurable options */
#define LIBPCAP_SNAPLEN 1518

@ -898,7 +898,7 @@ int main(int argc, char **argv)
//RunModeIdsPcap3(de_ctx, pcap_dev);
//RunModeIdsPcap2(de_ctx, pcap_dev);
//RunModeIdsPcap(de_ctx, pcap_dev);
TranslateIPToPcapDev(pcap_dev, sizeof(pcap_dev));
PcapTranslateIPToDevice(pcap_dev, sizeof(pcap_dev));
RunModeIdsPcapAuto(de_ctx, pcap_dev);
}
else if (run_mode == MODE_PCAP_FILE) {

Loading…
Cancel
Save