GSM: fix context initialization when client method is called before GSM.begin()

pennam · pennam · commit c5972429fc42 · 2024-04-18T15:20:02.000+02:00
diff --git a/libraries/GSM/src/GSM.cpp b/libraries/GSM/src/GSM.cpp
@@ -50,7 +50,9 @@ int arduino::GSMClass::begin(const char* pin, const char* apn, const char* usern
     reset();
   }
 
-  _context = mbed::CellularContext::get_default_instance();
+  if (!_context) {
+    _context = mbed::CellularContext::get_default_instance();
+  }
 
   if (_context == nullptr) {
     DEBUG_ERROR("Invalid mbed::CellularContext");
@@ -117,7 +119,10 @@ void arduino::GSMClass::end() {
 }
 
 int arduino::GSMClass::disconnect() {
-  return _context->disconnect();
+  if (_context) {
+    return _context->disconnect();
+  }
+  return 0;
 }
 
 unsigned long arduino::GSMClass::getTime()
@@ -144,9 +149,12 @@ bool arduino::GSMClass::isConnected()
   }
 }
 
-
-
 NetworkInterface* arduino::GSMClass::getNetwork() {
+  /* Can happen this is called before GSM.begin( .. ) when configuring GSMSSLClient
+   * from sketch calling client.appendCustomCACert( .. ) */
+  if (!_context) {
+    _context = mbed::CellularContext::get_default_instance();
+  }
   return _context;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,9 @@ int arduino::GSMClass::begin(const char* pin, const char* apn, const char* usern`
`50`	`50`	`reset();`
`51`	`51`	`}`
`52`	`52`
`53`		`- _context = mbed::CellularContext::get_default_instance();`
	`53`	`+ if (!_context) {`
	`54`	`+ _context = mbed::CellularContext::get_default_instance();`
	`55`	`+ }`
`54`	`56`
`55`	`57`	`if (_context == nullptr) {`
`56`	`58`	`DEBUG_ERROR("Invalid mbed::CellularContext");`
`@@ -117,7 +119,10 @@ void arduino::GSMClass::end() {`
`117`	`119`	`}`
`118`	`120`
`119`	`121`	`int arduino::GSMClass::disconnect() {`
`120`		`- return _context->disconnect();`
	`122`	`+ if (_context) {`
	`123`	`+ return _context->disconnect();`
	`124`	`+ }`
	`125`	`+ return 0;`
`121`	`126`	`}`
`122`	`127`
`123`	`128`	`unsigned long arduino::GSMClass::getTime()`
`@@ -144,9 +149,12 @@ bool arduino::GSMClass::isConnected()`
`144`	`149`	`}`
`145`	`150`	`}`
`146`	`151`
`147`		`-`
`148`		`-`
`149`	`152`	`NetworkInterface* arduino::GSMClass::getNetwork() {`
	`153`	`+ /* Can happen this is called before GSM.begin( .. ) when configuring GSMSSLClient`
	`154`	`+ * from sketch calling client.appendCustomCACert( .. ) */`
	`155`	`+ if (!_context) {`
	`156`	`+ _context = mbed::CellularContext::get_default_instance();`
	`157`	`+ }`
`150`	`158`	`return _context;`
`151`	`159`	`}`
`152`	`160`