Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed aodv-tracer warnings #6

Merged
merged 1 commit into from
Jan 16, 2024
Merged

fixed aodv-tracer warnings #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions main/aodv/aodv-tracer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void MrclAodvTracer::format(Packet *p, SAP *sap)
if (ch->ptype()!=PT_AODV)
return;

char pktinfo[50] = "";
char pktinfo[606] = "";
hdr_mrcl_aodv *ah = HDR_MRCL_AODV(p);
int saddrLen;
char saddr[MRCL_ADDRESS_MAX_LEN] = "";
Expand All @@ -61,10 +61,10 @@ void MrclAodvTracer::format(Packet *p, SAP *sap)
for(int i=saddrLen-1; i>=0; i--)
{
if (i==0)
sprintf(temp,"%d", rq->rq_src[i+sizeof(int)]);
snprintf(temp, sizeof(temp), "%d", rq->rq_src[i+sizeof(int)]);
else
sprintf(temp,"%d.", rq->rq_src[i+sizeof(int)]);
strcat(saddr,temp);
snprintf(temp, sizeof(temp), "%d.", rq->rq_src[i+sizeof(int)]);
strncat(saddr, temp, sizeof(saddr));
}
strcat(saddr,"\0");

Expand All @@ -75,14 +75,14 @@ void MrclAodvTracer::format(Packet *p, SAP *sap)
for(int i=daddrLen-1; i>=0; i--)
{
if (i==0)
sprintf(temp,"%d", rq->rq_dst[i+sizeof(int)]);
snprintf(temp, sizeof(temp), "%d", rq->rq_dst[i+sizeof(int)]);
else
sprintf(temp,"%d.", rq->rq_dst[i+sizeof(int)]);
strcat(daddr,temp);
snprintf(temp, sizeof(temp), "%d.", rq->rq_dst[i+sizeof(int)]);
strncat(daddr, temp, sizeof(daddr));
}
}
strcat(daddr,"\0");
sprintf(pktinfo, "RREQ s%s d%s id%d hc%d ", saddr, daddr, rq->rq_bcast_id, rq->rq_hop_count);
snprintf(pktinfo, sizeof(pktinfo), "RREQ s%s d%s id%d hc%d ", saddr, daddr, rq->rq_bcast_id, rq->rq_hop_count);

}else if (ah->ah_type == AODVTYPE_RREP)
{
Expand All @@ -92,10 +92,10 @@ void MrclAodvTracer::format(Packet *p, SAP *sap)
for(int i=saddrLen-1; i>=0; i--)
{
if (i==0)
sprintf(temp,"%d", rp->rp_src[i+sizeof(int)]);
snprintf(temp, sizeof(temp), "%d", rp->rp_src[i+sizeof(int)]);
else
sprintf(temp,"%d.", rp->rp_src[i+sizeof(int)]);
strcat(saddr,temp);
snprintf(temp, sizeof(temp), "%d.", rp->rp_src[i+sizeof(int)]);
strncat(saddr,temp, sizeof(saddr));
}
strcat(saddr,"\0");

Expand All @@ -106,24 +106,24 @@ void MrclAodvTracer::format(Packet *p, SAP *sap)
for(int i=daddrLen-1; i>=0; i--)
{
if (i==0)
sprintf(temp,"%d", rp->rp_dst[i+sizeof(int)]);
snprintf(temp, sizeof(temp), "%d", rp->rp_dst[i+sizeof(int)]);
else
sprintf(temp,"%d.", rp->rp_dst[i+sizeof(int)]);
strcat(daddr,temp);
snprintf(temp, sizeof(temp), "%d.", rp->rp_dst[i+sizeof(int)]);
strncat(daddr,temp, sizeof(daddr));
}
}
strcat(daddr,"\0");
sprintf(pktinfo, "RREP s%s d%s sno%d hc%d", saddr, daddr, rp->rp_dst_seqno, rp->rp_hop_count);
snprintf(pktinfo, sizeof(pktinfo), "RREP s%s d%s sno%d hc%d", saddr, daddr, rp->rp_dst_seqno, rp->rp_hop_count);
}else if (ah->ah_type == AODVTYPE_RERR)
{
strcat(pktinfo, "RERR");
snprintf(pktinfo, sizeof(pktinfo), "%s", "RERR");
}
else if (ah->ah_type == AODVTYPE_HELLO)
{
hdr_mrcl_aodv_reply *rp = HDR_MRCL_AODV_REPLY(p);
sprintf(pktinfo, "HELLO sno%d", rp->rp_dst_seqno);
snprintf(pktinfo, sizeof(pktinfo), "HELLO sno%d", rp->rp_dst_seqno);
}
else strcat(pktinfo, "UNKNW");
else snprintf(pktinfo, sizeof(pktinfo), "%s", "UNKNW");

writeTrace(sap, (char*)" --mAODV-- %s", pktinfo);

Expand Down