Refactor code

d3scomp · Mar 13, 2015 · d540dfb · d540dfb
1 parent aebdc23
commit d540dfb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/jdeeco-simulation-omnet-native/src/JDEECoApplication.cc b/jdeeco-simulation-omnet-native/src/JDEECoApplication.cc
@@ -64,8 +64,7 @@ void JDEECoApplication::registerCallbackAt(double absoluteTime, cMessage *msg) {
     scheduleAt(absoluteTime, msg);
 }
 
-void JDEECoApplication::sendPacket(JDEECoPacket *packet,
-		const char *recipient) {
+void JDEECoApplication::sendPacket(JDEECoPacket *packet, const char *recipient) {
 	if (opp_strcmp("", recipient) == 0) {
 		if (gate(lower802154LayerOut)->isConnected()) {
 			NetwToMacControlInfo::setControlInfo(packet, LAddress::L2BROADCAST);
@@ -74,7 +73,10 @@ void JDEECoApplication::sendPacket(JDEECoPacket *packet,
 		}
 	} else {
 		packet->setByteLength(packet80211ByteLength);
-		socket.sendTo(packet, IPvXAddressResolver().resolve(recipient).get4(), port);
+//		std::cout << "X" << std::endl;
+		IPvXAddress ip = IPvXAddressResolver().resolve(recipient).get4();
+//		std::cout << "Y" << std::endl;
+		socket.sendTo(packet, ip, port);
     }
 }
 

diff --git a/jdeeco-simulation-omnet-native/src/OMNeTJDEECoAPI.cc b/jdeeco-simulation-omnet-native/src/OMNeTJDEECoAPI.cc
@@ -53,13 +53,16 @@ JNIEXPORT void JNICALL Java_cz_cuni_mff_d3s_deeco_simulation_omnet_OMNeTNative_n
 		int length = env->GetArrayLength(packet);
 		jbyte *buffer = env->GetByteArrayElements(packet, 0);
 		JDEECoPacket *jPacket = new JDEECoPacket(JDEECO_DATA_MESSAGE);
-		//Setting data
+
+		// Setting data
 		jPacket->setDataArraySize(length);
-		for (int i = 0; i < length; i++)
-		jPacket->setData(i, buffer[i]);
+		for (int i = 0; i < length; i++) {
+			jPacket->setData(i, buffer[i]);
+		}
 		const char *cRecipient = env->GetStringUTFChars(recipient, 0);
 		EV << "OMNET++ ("<< simTime() <<") : " << module->getModuleId() << " sending packet with ID = " << jPacket->getId() << endl;
 		module->sendPacket(jPacket, cRecipient);
+
 		env->ReleaseByteArrayElements(packet, buffer, JNI_ABORT);
 		env->ReleaseStringUTFChars(recipient, cRecipient);
 		env->DeleteLocalRef(packet);