giomba/nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[cash] pointer issue basket_address + ids as uint32_t

Browse Source 
- basket_address held the pointer to a value that is replaced for every new packet coming from the network layer, so the value itself it should be copied, not the pointer; this lead to board reset when dereferencing it
- product_id and customer_id are on 32 bits (no supermarket has less than 256 products and/or customers), otherwise I think it would fail
This commit is contained in:
giomba 2019-04-14 15:23:27 +02:00
parent e453711712
commit ccaac68102
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
project/Natalia/cassa.c
View File

@ -20,9 +20,9 @@ typedef struct user_invoice
{ {
uint8_t n_prods; uint8_t n_prods;
float total_sum; float total_sum;
uint8_t customer_id; uint32_t customer_id;
uint8_t empty; uint8_t empty;
linkaddr_t* address_basket; linkaddr_t address_basket;
}user_invoice; }user_invoice;
@ -63,9 +63,9 @@ static void input_callback(const void* data, uint16_t len, const linkaddr_t* sou
static user_invoice invoices[MAX_CUSTOMERS]; static user_invoice invoices[MAX_CUSTOMERS];
if (len == sizeof(*data)) { // if (len == sizeof(*data)) {
memcpy (&received_msg, data, sizeof ((msg *)data)); memcpy (&received_msg, data, sizeof(received_msg));
LOG_INFO("Received data"); LOG_INFO("Received data ");
LOG_INFO_LLADDR(source_address); //this is the link layer address LOG_INFO_LLADDR(source_address); //this is the link layer address
LOG_INFO("\n"); LOG_INFO("\n");
//we need to receive an additional message to start the process of receiving the products because if we start receiving the products immediately //we need to receive an additional message to start the process of receiving the products because if we start receiving the products immediately
@ -77,25 +77,23 @@ static void input_callback(const void* data, uint16_t len, const linkaddr_t* sou
invoices[index].n_prods = basket->n_products; invoices[index].n_prods = basket->n_products;
invoices[index].total_sum = 0; invoices[index].total_sum = 0;
invoices[index].customer_id = basket->customer_id; invoices[index].customer_id = basket->customer_id;
memcpy(&invoices[index].address_basket, source_address, sizeof(*source_address)); memcpy(&invoices[index].address_basket, source_address, sizeof(linkaddr_t));
// invoices[index].address_basket = source_address; // invoices[index].address_basket = source_address;
msg start_sending_list; msg start_sending_list;
start_sending_list.msg_type = START_OF_LIST_PRODUCTS_MSG; start_sending_list.msg_type = START_OF_LIST_PRODUCTS_MSG;
nullnet_buf = (uint8_t*)&start_sending_list; nullnet_buf = (uint8_t*)&start_sending_list;
LOG_INFO("Sending acknowledgment to start sending list of products"); LOG_INFO("Sending acknowledgment to start sending list of products to ");
LOG_INFO_("\n"); LOG_INFO_LLADDR(&(invoices[index].address_basket));
nullnet_len = sizeof(start_sending_list); nullnet_len = sizeof(start_sending_list);
NETSTACK_NETWORK.output((invoices[index].address_basket)); NETSTACK_NETWORK.output(&(invoices[index].address_basket));
} else } else
printf("Reached max number of customers"); printf("Reached max number of customers\n");
} }
if (received_msg.msg_type == PRODUCT_MSG) { if (received_msg.msg_type == PRODUCT_MSG) {
product_msg *product = (product_msg*)(&received_msg); product_msg *product = (product_msg*)(&received_msg);
printf("Received id: %d, price %f\n", (int)product->product_id, product->price);
uint8_t index = invoice_index(product->customer_id, invoices); uint8_t index = invoice_index(product->customer_id, invoices);
if (index != -1) { if (index != -1) {
if (invoices[index].n_prods > 0) { if (invoices[index].n_prods > 0) {
@ -107,15 +105,15 @@ static void input_callback(const void* data, uint16_t len, const linkaddr_t* sou
invoices[index].empty = 1; invoices[index].empty = 1;
} }
}else }else
printf("Customer with that id is not associated to any basket!"); printf("Customer with that id is not associated to any basket!\n");
} }
} // }
} }
PROCESS_THREAD(cassa_main_process, ev, data) { PROCESS_THREAD(cassa_main_process, ev, data) {
PROCESS_BEGIN(); PROCESS_BEGIN();
static uint8_t customer_id; static uint32_t customer_id;
static cash_out_msg bro_customer_id; static cash_out_msg bro_customer_id;
cc26xx_uart_set_input(serial_line_input_byte); cc26xx_uart_set_input(serial_line_input_byte);