Skip to content

Commit

Permalink
minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@surangamh
surangamh committed Sep 20, 2023
1 parent a7a7082 commit 8dee4c0
Show file tree
Hide file tree
Showing 8 changed files with 30 additions and 39 deletions.
6 changes: 3 additions & 3 deletions host/udp_host_receiver_if0.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ int main(int argc, char **argv) {
socket_type sockets[16] = {0};
unsigned int packet_size_total;
uint32_t rxPkt = 1;
unsigned int dec = 0;
bool dec = false;

if(argc >= 3){
rxPkt = strtol(argv[2], NULL, 10);
Expand All @@ -43,12 +43,12 @@ int main(int argc, char **argv) {
if (strcmp(argv[3],"decrypt")==0)
{
printf("decryption enabled...\n");
dec = 1;
dec = true;
}
else if (strcmp(argv[3], "no-decrypt")==0)
{
printf("decryption not enabled...\n");
dec = 0;
dec = false;
}
}

Expand Down
6 changes: 3 additions & 3 deletions host/udp_host_receiver_if1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ int main(int argc, char **argv) {
socket_type sockets[16] = {0};
unsigned int packet_size_total;
uint32_t rxPkt = 1;
unsigned int dec = 0;
bool dec = false;

if(argc >= 3){
rxPkt = strtol(argv[2], NULL, 10);
Expand All @@ -43,12 +43,12 @@ int main(int argc, char **argv) {
if (strcmp(argv[3],"decrypt")==0)
{
printf("decryption enabled...\n");
dec = 1;
dec = true;
}
else if (strcmp(argv[3], "no-decrypt")==0)
{
printf("decryption not enabled...\n");
dec = 0;
dec = false;
}
}

Expand Down
10 changes: 5 additions & 5 deletions host/udp_host_receiver_if3.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ int main(int argc, char **argv) {
socket_type sockets[2][16] = {0};
unsigned int packet_size_total[2];
uint32_t rxPkt[2] = {1, 1};
unsigned int dec[2] = {0, 0};
bool dec[2] = {false, false};
unsigned int dest = 0;

if(argc >= 4){
Expand All @@ -46,22 +46,22 @@ int main(int argc, char **argv) {
if (strcmp(argv[4],"decrypt")==0)
{
printf("decryption enabled on channel 0...\n");
dec[0] = 1;
dec[0] = true;
}
else if (strcmp(argv[4], "no-decrypt")==0)
{
printf("decryption not enabled on channel 0...\n");
dec[0] = 0;
dec[0] = false;
}
if (strcmp(argv[5],"decrypt")==0)
{
printf("decryption enabled on channel 1...\n");
dec[1] = 1;
dec[1] = true;
}
else if (strcmp(argv[5], "no-decrypt")==0)
{
printf("decryption not enabled on channel 1...\n");
dec[1] = 0;
dec[1] = false;
}

}
Expand Down
10 changes: 4 additions & 6 deletions host/udp_host_sender_if0.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ int main(int argc, char **argv) {
socket_type sockets[16] = {0};
unsigned int packet_size_total;
uint32_t txPkt = 1;
unsigned int enc = 0;
unsigned int dest = 0;
bool enc = false;

if(argc >= 3){
txPkt = strtol(argv[2], NULL, 10);
Expand All @@ -43,12 +42,12 @@ int main(int argc, char **argv) {
if (strcmp(argv[3],"encrypt")==0)
{
printf("encryption enabled...\n");
enc = 1;
enc = true;
}
else if (strcmp(argv[3],"no-encrypt")==0)
{
printf("encryption not enabled...\n");
enc = 0;
enc = false;
}
}

Expand Down Expand Up @@ -141,8 +140,7 @@ int main(int argc, char **argv) {
xrt::run tx0_run = xrt::run(txkrnl_0);
tx0_run.set_arg(0, buffer_packetdata) ;
tx0_run.set_arg(2, packet_size_total) ;
tx0_run.set_arg(3, dest);
tx0_run.set_arg(4, enc);
tx0_run.set_arg(3, enc);
tx0_run.start();
tx0_run.wait();
printf("Message of size %d sent.\n", packet_size_total);
Expand Down
12 changes: 5 additions & 7 deletions host/udp_host_sender_if1.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ int main(int argc, char **argv) {
socket_type sockets[16] = {0};
unsigned int packet_size_total;
uint32_t txPkt = 1;
unsigned int enc = 0;
unsigned int dest = 0;
bool enc = false;

if(argc >= 3){
txPkt = strtol(argv[2], NULL, 10);
Expand All @@ -43,12 +42,12 @@ int main(int argc, char **argv) {
if (strcmp(argv[3],"encrypt")==0)
{
printf("encryption enabled...\n");
enc = 1;
enc = true;
}
else if (strcmp(argv[3],"no-encrypt")==0)
{
printf("encryption not enabled...\n");
enc = 0;
enc = false;
}
}

Expand Down Expand Up @@ -128,7 +127,7 @@ int main(int argc, char **argv) {
}
}

//User Logic
//User Logic
xrt::kernel txkrnl_1 = xrt::kernel(device, xclbin_uuid, "txkrnl:{txkrnl_1}");
char *code = readFile("./alice29.txt");
if (code == NULL) {
Expand All @@ -141,8 +140,7 @@ int main(int argc, char **argv) {
xrt::run tx1_run = xrt::run(txkrnl_1);
tx1_run.set_arg(0, buffer_packetdata) ;
tx1_run.set_arg(2, packet_size_total) ;
tx1_run.set_arg(3, dest);
tx1_run.set_arg(4, enc);
tx1_run.set_arg(3, enc);
tx1_run.start();
tx1_run.wait();
printf("Message of size %d sent.\n", packet_size_total);
Expand Down
14 changes: 6 additions & 8 deletions host/udp_host_sender_if3.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,7 @@ int main(int argc, char **argv) {
socket_type sockets[2][16] = {0};
unsigned int packet_size_total[2];
uint32_t txPkt[2] = {1, 1};
unsigned int enc[2] = {0, 0};
unsigned int dest = 0;
bool enc[2] = {false, false};

if(argc >= 4){
txPkt[0] = strtol(argv[2], NULL, 10);
Expand All @@ -46,22 +45,22 @@ int main(int argc, char **argv) {
if (strcmp(argv[4],"encrypt")==0)
{
printf("encryption enabled on channel 0...\n");
enc[0] = 1;
enc[0] = true;
}
else if (strcmp(argv[4],"no-encrypt")==0)
{
printf("encryption not enabled on channel 0...\n");
enc[0] = 0;
enc[0] = false;
}
if (strcmp(argv[5],"encrypt")==0)
{
printf("encryption enabled on channel 1...\n");
enc[1] = 1;
enc[1] = true;
}
else if (strcmp(argv[5],"no-encrypt")==0)
{
printf("encryption not enabled on channel 1...\n");
enc[1] = 0;
enc[1] = false;
}
}

Expand Down Expand Up @@ -162,8 +161,7 @@ int main(int argc, char **argv) {
xrt::run tx_run = xrt::run(txkrnl);
tx_run.set_arg(0, buffer_packetdata) ;
tx_run.set_arg(2, packet_size_total[idx]) ;
tx_run.set_arg(3, dest);
tx_run.set_arg(4, enc[idx]);
tx_run.set_arg(3, enc[idx]);
tx_run.start();
tx_run.wait();
printf("Message of size %d sent.\n", packet_size_total[idx]);
Expand Down
4 changes: 2 additions & 2 deletions user_krnl/src/rxkrnl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ extern "C" {
void rxkrnl(ap_uint<DWIDTH> *out, // Write only memory mapped
hls::stream<pkt> &n2k, // Internal Stream
unsigned int size, // Size in bytes
unsigned int dec // decrypt data
bool dec // decrypt data
) {
#pragma HLS INTERFACE m_axi port = out offset = slave bundle = gmem
#pragma HLS INTERFACE axis port = n2k
Expand Down Expand Up @@ -89,7 +89,7 @@ KeyExpansion(key, Nk, expandedKey);
//out[i] = v.data;
tmp = v.data;

if (dec==1){
if (dec){
for (int k = 0; k < (512/128); k++){
#pragma HLS UNROLL
unsigned char ciphertext[stt_lng];
Expand Down
7 changes: 2 additions & 5 deletions user_krnl/src/txkrnl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,12 @@ extern "C" {
void txkrnl(ap_uint<DWIDTH> *in, // Read-Only Vector 1
hls::stream<pkt> &k2n, // Internal Stream
unsigned int size, // Size in bytes
unsigned int dest, // destination ID
unsigned int enc // encrypt
bool enc // encrypt
) {
#pragma HLS INTERFACE m_axi port = in offset = slave bundle = gmem
#pragma HLS INTERFACE axis port = k2n
#pragma HLS INTERFACE s_axilite port = in bundle = control
#pragma HLS INTERFACE s_axilite port = size bundle = control
#pragma HLS INTERFACE s_axilite port = dest bundle = control
#pragma HLS INTERFACE s_axilite port = enc bundle = control
#pragma HLS INTERFACE s_axilite port = return bundle = control

Expand Down Expand Up @@ -90,7 +88,7 @@ void txkrnl(ap_uint<DWIDTH> *in, // Read-Only Vector 1
ap_uint<512> tmp = in[i];
ap_uint<512> out;

if (enc == 1){
if (enc){
for (int k = 0; k < (512/128); k++){
#pragma HLS UNROLL
unsigned char plaintext[stt_lng];
Expand All @@ -117,7 +115,6 @@ void txkrnl(ap_uint<DWIDTH> *in, // Read-Only Vector 1
else
v.last = 0;

v.dest = dest;
k2n.write(v);
}
}
Expand Down

0 comments on commit 8dee4c0

Please sign in to comment.