Changeset 279

Show
Ignore:
Timestamp:
06/16/09 12:03:31 (15 years ago)
Author:
wrodgers
Message:

Updated shell to conform with API

Location:
vtcross/trunk/src
Files:
4 modified

Legend:

Unmodified
Added
Removed

  • vtcross/trunk/src/service_management_layer/Makefile.am

    r278 r279  
    33AM_CXXFLAGS = -Wall -g 
    44 
    5 bin_PROGRAMS = sml_demo 
     5bin_PROGRAMS = sml_demo ce_test_demo 
    66 
    77sml_demo_SOURCES = ServiceManagementLayer.cpp sml_demo.cpp 
    88sml_demo_LDADD = -ldl -lpthread -lsqlite3  ../lib/tinyxml/libtinyxml.a ../lib/socketcomm/libsocketcomm.a 
    99 
    10  
     10ce_test_demo_SOURCES = ce_test_demo.cpp 
     11ce_test_demo_LDADD = -ldl -lpthread ../lib/socketcomm/libsocketcomm.a 

  • vtcross/trunk/src/service_management_layer/ServiceManagementLayer.cpp

    r278 r279  
    449449ServiceManagementLayer::TransferRadioConfiguration(int32_t ID) 
    450450{ 
     451    printf("transRadConfig\n"); 
    451452    struct timeval selTimeout; 
    452453    fd_set sockSet; 
    … …  
    11521153    SendMessage(CE_List[ID].FD, buffer); 
    11531154 
    1154     //TODO UNCOMMENT!!! 
    1155     //TODO UNCOMMENT!!! 
    1156     /*TransferRadioConfiguration(ID); 
     1155    TransferRadioConfiguration(ID); 
    11571156    memset(buffer, 0, 256); 
    11581157    TransferExperience(ID); 
    1159     memset(buffer, 0, 256);*/ 
     1158    memset(buffer, 0, 256); 
    11601159    numberOfCognitiveEngines++; 
    11611160    CE_Present = true; 
    … …  
    12461245ServiceManagementLayer::StartSMLServer() 
    12471246{ 
     1247    printf("Ready for CE Signal! (registration done)\n"); 
    12481248    struct timeval selTimeout; 
    12491249    int32_t running = 1; 

  • vtcross/trunk/src/service_management_layer/sml_demo.cpp

    r278 r279  
    1717 
    1818#include "sqlite3.h" 
    19  
    20  
    2119 
    2220//#include "tinyxml.h" 
    … …  
    5048 
    5149int main(int argc, char *argv[]) 
    52 {    
    53     int shell = CreateTCPServerSocket(1979); 
    54     //sleep(2); 
    55     int temp = AcceptTCPConnection(shell);  
    56    // SendMessage(temp, "list_services"); 
    57     sleep(1); 
    58     int FD = ClientSocket("127.0.0.1", "2036");  
    59     SendMessage(FD, "register_engine_cognitive");    
    60     SendMessage(FD, "register_service"); 
    61     SendMessage(FD, "test_srv");  
    62     SendMessage(FD, "list_services"); 
    63     int FD2 = ClientSocket("127.0.0.1", "2036");  
    64     SendMessage(FD2, "register_engine_cognitive");    
    65     SendMessage(FD2, "register_service"); 
    66     SendMessage(FD2, "test_srv1");  
    67     SendMessage(FD2, "register_service"); 
    68     SendMessage(FD2, "test_srv2"); 
    69     SendMessage(FD2, "list_services"); 
    70     sleep(1); 
    71     printf("preread1\n"); 
     50{   
    7251 
    73     char buffer[256]; 
    74     memset(buffer, 0, 256); 
    75  
    76     SendMessage(temp, "set_active_mission"); 
    77     SendMessage(temp, "0");  
    78     SendMessage(temp, "request_optimization"); 
    79     SendMessage(temp, "params"); 
    80     ReadMessage(FD, buffer); 
    81     printf("preread2\n"); 
    82     printf("-----buffer1= %s-------\n", buffer); 
    83     ReadMessage(FD, buffer); 
    84     printf("-----buffer2= %s-------\n", buffer); 
    85     memset(buffer, 0, 256); 
    86     ReadMessage(FD, buffer); 
    87     printf("-----buffer3= %s-------\n", buffer); 
    88     SendMessage(FD, "ACK"); 
    89     SendMessage(FD, "temp"); 
    90     SendMessage(FD, "raw_data"); 
    91     ReadMessage(FD2, buffer); 
    92     printf("-----buffer4= %s-------\n", buffer); 
    93     ReadMessage(FD2, buffer); 
    94     printf("-----buffer5= %s-------\n", buffer); 
    95     ReadMessage(FD2, buffer); 
    96     printf("-----buffer6= %s-------\n", buffer); 
    97     SendMessage(FD2, "ACK"); 
    98     ReadMessage(FD2, buffer); 
    99     printf("-----buffer7= %s-------\n", buffer); 
    100     ReadMessage(FD2, buffer); 
    101     printf("-----buffer8= %s-------\n", buffer); 
    102     ReadMessage(FD2, buffer); 
    103     printf("-----buffer9= %s-------\n", buffer); 
    104     SendMessage(FD2, "ACK"); 
    105     SendMessage(FD2, "trans"); 
    106     ReadMessage(temp, buffer); 
    107     printf("-----buffer10= %s-------\n", buffer); 
    108     SendMessage(temp, "ACK"); 
    109     /*ReadMessage(FD, buffer); 
    110     printf("-----buffer1= %s-------\n", buffer); 
    111     ReadMessage(FD, buffer); 
    112     printf("-----buffer2= %s-------\n", buffer); 
    113     memset(buffer, 0, 256); 
    114     ReadMessage(FD, buffer); 
    115     printf("-----buffer3= %s-------\n", buffer); 
    116     SendMessage(FD, "ACK"); 
    117     SendMessage(FD, "true"); 
    118     SendMessage(FD, "data"); 
    119     ReadMessage(FD2, buffer); 
    120     printf("-----buffer4= %s-------\n", buffer); 
    121     ReadMessage(FD2, buffer); 
    122     printf("-----buffer5= %s-------\n", buffer); 
    123     memset(buffer, 0, 256); 
    124     ReadMessage(FD2, buffer); 
    125     printf("-----buffer6= %s-------\n", buffer); 
    126     SendMessage(FD2, "ACK"); 
    127     SendMessage(FD2, "trans"); 
    128     ReadMessage(temp, buffer); 
    129     printf("-----buffer7= %s-------\n", buffer); 
    130     SendMessage(temp, "ACK");*/ 
    131     
    132      
    133  
    134     //SendMessage(temp, "list_services");   
    135     while(true){    
    136     char buffer[256]; 
    137     memset(buffer, 0, 256); 
    138     ReadMessage(temp, buffer); 
    139     printf("------%s------\n", buffer);} 
    140    /*memset(buffer, 0, 256); 
    141     ReadMessage(temp, buffer); 
    142     printf("------%s------\n", buffer);*/ 
     52    if(argc < 3) 
     53       ERROR(1, "Usage: %s config hostname port\n", argv[0]); 
     54  
     55    ServiceManagementLayer SML(argv[1], argv[2], argv[3]); 
     56    SML.StartSMLServer();      
    14357} 

  • vtcross/trunk/src/shell/CognitiveRadioShell.cpp

    r239 r279  
    208208    LOG("Cognitive Radio Shell:: Received registration message from Cognitive Engine.\n"); 
    209209    
     210    SendMessage(socketFD, "register_ack"); 
    210211    SendRadioConfiguration(socketFD); 
    211212    SendRadioExperience(socketFD);